diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-14 08:48:16 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-14 08:48:16 (GMT) |
| commit | c96a9876696d30783ad54399351a0bf3660db53f (patch) | |
| tree | 74daba0ed1fd2838e8eb527c4f7fe5262ee979bd /fs/autofs4/inode.c | |
| parent | d1f42e314c9c50541c79a6edf2b4cab63fe02ee3 (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
| download | linux-fsl-qoriq-c96a9876696d30783ad54399351a0bf3660db53f.tar.xz | |
Merge tag 'v3.3-rc7' into x86/platform
Merge reason: Update to the almost-final v3.3 kernel.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/autofs4/inode.c')
| -rw-r--r-- | fs/autofs4/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index e16980b..06858d9 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c @@ -19,6 +19,7 @@ #include <linux/parser.h> #include <linux/bitops.h> #include <linux/magic.h> +#include <linux/compat.h> #include "autofs_i.h" #include <linux/module.h> @@ -224,6 +225,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) set_autofs_type_indirect(&sbi->type); sbi->min_proto = 0; sbi->max_proto = 0; + sbi->compat_daemon = is_compat_task(); mutex_init(&sbi->wq_mutex); mutex_init(&sbi->pipe_mutex); spin_lock_init(&sbi->fs_lock); |