diff options
| author | Ian Kent <raven@themaw.net> | 2008-10-15 22:02:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 11:21:39 -0700 |
| commit | bb979d7fc360bc37cbaff43a6fafceb897cb5e47 (patch) | |
| tree | b99f90b4cacebf1e8cd5725917fd14cf8d1c50ac /fs/autofs4/inode.c | |
| parent | 624ae5284516870657505103ada531c64dba2a9a (diff) | |
| download | linux-bb979d7fc360bc37cbaff43a6fafceb897cb5e47.tar.gz linux-bb979d7fc360bc37cbaff43a6fafceb897cb5e47.tar.bz2 linux-bb979d7fc360bc37cbaff43a6fafceb897cb5e47.zip | |
autofs4: cleanup autofs mount type usage
Usage of the AUTOFS_TYPE_* defines is a little confusing and appears
inconsistent.
Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/autofs4/inode.c')
| -rw-r--r-- | fs/autofs4/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index 45d55819203d..7303099fcc1a 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c @@ -288,7 +288,7 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid, *type = AUTOFS_TYPE_DIRECT; break; case Opt_offset: - *type = AUTOFS_TYPE_DIRECT | AUTOFS_TYPE_OFFSET; + *type = AUTOFS_TYPE_OFFSET; break; default: return 1; @@ -336,7 +336,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) sbi->sb = s; sbi->version = 0; sbi->sub_version = 0; - sbi->type = 0; + sbi->type = AUTOFS_TYPE_INDIRECT; sbi->min_proto = 0; sbi->max_proto = 0; mutex_init(&sbi->wq_mutex); @@ -378,7 +378,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) } root_inode->i_fop = &autofs4_root_operations; - root_inode->i_op = sbi->type & AUTOFS_TYPE_DIRECT ? + root_inode->i_op = sbi->type & AUTOFS_TYPE_TRIGGER ? &autofs4_direct_root_inode_operations : &autofs4_indirect_root_inode_operations; |