renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-20 00:26:39 +08:00
Code

autofs4: cleanup autofs mount type usage

Browse Source 
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>
This commit is contained in:
Ian Kent 2008-10-15 22:02:52 -07:00 committed by Linus Torvalds
parent 624ae52845
commit bb979d7fc3
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/autofs4/autofs_i.h
View File

@ -21,6 +21,8 @@
#define AUTOFS_IOC_FIRST AUTOFS_IOC_READY #define AUTOFS_IOC_FIRST AUTOFS_IOC_READY
#define AUTOFS_IOC_COUNT 32 #define AUTOFS_IOC_COUNT 32
#define AUTOFS_TYPE_TRIGGER (AUTOFS_TYPE_DIRECT|AUTOFS_TYPE_OFFSET)
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/time.h> #include <linux/time.h>
@ -92,10 +94,6 @@ struct autofs_wait_queue {
#define AUTOFS_SBI_MAGIC 0x6d4a556d #define AUTOFS_SBI_MAGIC 0x6d4a556d
#define AUTOFS_TYPE_INDIRECT 0x0001
#define AUTOFS_TYPE_DIRECT 0x0002
#define AUTOFS_TYPE_OFFSET 0x0004
struct autofs_sb_info { struct autofs_sb_info {
u32 magic; u32 magic;
int pipefd; int pipefd;

2
fs/autofs4/expire.c
View File

@ -479,7 +479,7 @@ int autofs4_expire_multi(struct super_block *sb, struct vfsmount *mnt,
if (arg && get_user(do_now, arg)) if (arg && get_user(do_now, arg))
return -EFAULT; return -EFAULT;
if (sbi->type & AUTOFS_TYPE_DIRECT) if (sbi->type & AUTOFS_TYPE_TRIGGER)
dentry = autofs4_expire_direct(sb, mnt, sbi, do_now); dentry = autofs4_expire_direct(sb, mnt, sbi, do_now);
else else
dentry = autofs4_expire_indirect(sb, mnt, sbi, do_now); dentry = autofs4_expire_indirect(sb, mnt, sbi, do_now);

6
fs/autofs4/inode.c
View File

@ -288,7 +288,7 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,
*type = AUTOFS_TYPE_DIRECT; *type = AUTOFS_TYPE_DIRECT;
break; break;
case Opt_offset: case Opt_offset:
*type = AUTOFS_TYPE_DIRECT | AUTOFS_TYPE_OFFSET; *type = AUTOFS_TYPE_OFFSET;
break; break;
default: default:
return 1; return 1;
@ -336,7 +336,7 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent)
sbi->sb = s; sbi->sb = s;
sbi->version = 0; sbi->version = 0;
sbi->sub_version = 0; sbi->sub_version = 0;
sbi->type = 0; sbi->type = AUTOFS_TYPE_INDIRECT;
sbi->min_proto = 0; sbi->min_proto = 0;
sbi->max_proto = 0; sbi->max_proto = 0;
mutex_init(&sbi->wq_mutex); 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_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_direct_root_inode_operations :
&autofs4_indirect_root_inode_operations; &autofs4_indirect_root_inode_operations;

8
fs/autofs4/waitq.c
View File

@ -337,7 +337,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
* is very similar for indirect mounts except only dentrys * is very similar for indirect mounts except only dentrys
* in the root of the autofs file system may be negative. * in the root of the autofs file system may be negative.
*/ */
if (sbi->type & (AUTOFS_TYPE_DIRECT|AUTOFS_TYPE_OFFSET)) if (sbi->type & AUTOFS_TYPE_TRIGGER)
return -ENOENT; return -ENOENT;
else if (!IS_ROOT(dentry->d_parent)) else if (!IS_ROOT(dentry->d_parent))
return -ENOENT; return -ENOENT;
@ -348,7 +348,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
return -ENOMEM; return -ENOMEM;
/* If this is a direct mount request create a dummy name */ /* If this is a direct mount request create a dummy name */
if (IS_ROOT(dentry) && (sbi->type & AUTOFS_TYPE_DIRECT)) if (IS_ROOT(dentry) && sbi->type & AUTOFS_TYPE_TRIGGER)
qstr.len = sprintf(name, "%p", dentry); qstr.len = sprintf(name, "%p", dentry);
else { else {
qstr.len = autofs4_getpath(sbi, dentry, &name); qstr.len = autofs4_getpath(sbi, dentry, &name);
@ -406,11 +406,11 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
type = autofs_ptype_expire_multi; type = autofs_ptype_expire_multi;
} else { } else {
if (notify == NFY_MOUNT) if (notify == NFY_MOUNT)
type = (sbi->type & AUTOFS_TYPE_DIRECT) ? type = (sbi->type & AUTOFS_TYPE_TRIGGER) ?
autofs_ptype_missing_direct : autofs_ptype_missing_direct :
autofs_ptype_missing_indirect; autofs_ptype_missing_indirect;
else else
type = (sbi->type & AUTOFS_TYPE_DIRECT) ? type = (sbi->type & AUTOFS_TYPE_TRIGGER) ?
autofs_ptype_expire_direct : autofs_ptype_expire_direct :
autofs_ptype_expire_indirect; autofs_ptype_expire_indirect;
} }

5
include/linux/auto_fs4.h
View File

@ -29,6 +29,11 @@
#define AUTOFS_EXP_IMMEDIATE 1 #define AUTOFS_EXP_IMMEDIATE 1
#define AUTOFS_EXP_LEAVES 2 #define AUTOFS_EXP_LEAVES 2
#define AUTOFS_TYPE_ANY 0x0000
#define AUTOFS_TYPE_INDIRECT 0x0001
#define AUTOFS_TYPE_DIRECT 0x0002
#define AUTOFS_TYPE_OFFSET 0x0004
/* Daemon notification packet types */ /* Daemon notification packet types */
enum autofs_notify { enum autofs_notify {
NFY_NONE, NFY_NONE,