redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[PATCH] autofs4: change AUTOFS_TYP_* AUTOFS_TYPE_* 

Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
wifi-calibration
Ian Kent 2006-03-27 01:14:56 -08:00 committed by Linus Torvalds
parent 5c0a32fc2c
commit 44d53eb041
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/autofs4/autofs_i.h
View File

@ -91,9 +91,9 @@ struct autofs_wait_queue {
#define AUTOFS_SBI_MAGIC 0x6d4a556d #define AUTOFS_SBI_MAGIC 0x6d4a556d
#define AUTOFS_TYP_INDIRECT 0x0001 #define AUTOFS_TYPE_INDIRECT 0x0001
#define AUTOFS_TYP_DIRECT 0x0002 #define AUTOFS_TYPE_DIRECT 0x0002
#define AUTOFS_TYP_OFFSET 0x0004 #define AUTOFS_TYPE_OFFSET 0x0004
struct autofs_sb_info { struct autofs_sb_info {
u32 magic; u32 magic;

2
fs/autofs4/expire.c
View File

@ -424,7 +424,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_TYP_DIRECT) if (sbi->type & AUTOFS_TYPE_DIRECT)
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);

12
fs/autofs4/inode.c
View File

@ -178,9 +178,9 @@ static int autofs4_show_options(struct seq_file *m, struct vfsmount *mnt)
seq_printf(m, ",minproto=%d", sbi->min_proto); seq_printf(m, ",minproto=%d", sbi->min_proto);
seq_printf(m, ",maxproto=%d", sbi->max_proto); seq_printf(m, ",maxproto=%d", sbi->max_proto);
if (sbi->type & AUTOFS_TYP_OFFSET) if (sbi->type & AUTOFS_TYPE_OFFSET)
seq_printf(m, ",offset"); seq_printf(m, ",offset");
else if (sbi->type & AUTOFS_TYP_DIRECT) else if (sbi->type & AUTOFS_TYPE_DIRECT)
seq_printf(m, ",direct"); seq_printf(m, ",direct");
else else
seq_printf(m, ",indirect"); seq_printf(m, ",indirect");
@ -267,13 +267,13 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,
*maxproto = option; *maxproto = option;
break; break;
case Opt_indirect: case Opt_indirect:
*type = AUTOFS_TYP_INDIRECT; *type = AUTOFS_TYPE_INDIRECT;
break; break;
case Opt_direct: case Opt_direct:
*type = AUTOFS_TYP_DIRECT; *type = AUTOFS_TYPE_DIRECT;
break; break;
case Opt_offset: case Opt_offset:
*type = AUTOFS_TYP_DIRECT | AUTOFS_TYP_OFFSET; *type = AUTOFS_TYPE_DIRECT | AUTOFS_TYPE_OFFSET;
break; break;
default: default:
return 1; return 1;
@ -364,7 +364,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_TYP_DIRECT ? root_inode->i_op = sbi->type & AUTOFS_TYPE_DIRECT ?
&autofs4_direct_root_inode_operations : &autofs4_direct_root_inode_operations :
&autofs4_indirect_root_inode_operations; &autofs4_indirect_root_inode_operations;

6
fs/autofs4/waitq.c
View File

@ -207,7 +207,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_TYP_DIRECT)) if (IS_ROOT(dentry) && (sbi->type & AUTOFS_TYPE_DIRECT))
len = sprintf(name, "%p", dentry); len = sprintf(name, "%p", dentry);
else { else {
len = autofs4_getpath(sbi, dentry, &name); len = autofs4_getpath(sbi, dentry, &name);
@ -283,11 +283,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_TYP_DIRECT) ? type = (sbi->type & AUTOFS_TYPE_DIRECT) ?
autofs_ptype_missing_direct : autofs_ptype_missing_direct :
autofs_ptype_missing_indirect; autofs_ptype_missing_indirect;
else else
type = (sbi->type & AUTOFS_TYP_DIRECT) ? type = (sbi->type & AUTOFS_TYPE_DIRECT) ?
autofs_ptype_expire_direct : autofs_ptype_expire_direct :
autofs_ptype_expire_indirect; autofs_ptype_expire_indirect;
} }