Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44d53eb0 authored by Ian Kent's avatar Ian Kent Committed by Linus Torvalds
Browse files

[PATCH] autofs4: change AUTOFS_TYP_* AUTOFS_TYPE_* 



Signed-off-by: default avatarIan Kent <raven@themaw.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5c0a32fc

fs/autofs4/autofs_i.h

+3 −3
Original line number Diff line number Diff line
@@ -91,9 +91,9 @@ struct autofs_wait_queue { 


#define AUTOFS_SBI_MAGIC 0x6d4a556d



#define AUTOFS_TYP_INDIRECT     0x0001

#define AUTOFS_TYP_DIRECT       0x0002

#define AUTOFS_TYP_OFFSET       0x0004

#define AUTOFS_TYPE_INDIRECT     0x0001

#define AUTOFS_TYPE_DIRECT       0x0002

#define AUTOFS_TYPE_OFFSET       0x0004



struct autofs_sb_info {

	u32 magic;

fs/autofs4/expire.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ int autofs4_expire_multi(struct super_block *sb, struct vfsmount *mnt, 
	if (arg && get_user(do_now, arg))

		return -EFAULT;



	if (sbi->type & AUTOFS_TYP_DIRECT)

	if (sbi->type & AUTOFS_TYPE_DIRECT)

		dentry = autofs4_expire_direct(sb, mnt, sbi, do_now);

	else

		dentry = autofs4_expire_indirect(sb, mnt, sbi, do_now);

fs/autofs4/inode.c

+6 −6
Original line number Diff line number Diff line
@@ -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, ",maxproto=%d", sbi->max_proto);



	if (sbi->type & AUTOFS_TYP_OFFSET)

	if (sbi->type & AUTOFS_TYPE_OFFSET)

		seq_printf(m, ",offset");

	else if (sbi->type & AUTOFS_TYP_DIRECT)

	else if (sbi->type & AUTOFS_TYPE_DIRECT)

		seq_printf(m, ",direct");

	else

		seq_printf(m, ",indirect");
@@ -267,13 +267,13 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid, 
			*maxproto = option;

			break;

		case Opt_indirect:

			*type = AUTOFS_TYP_INDIRECT;

			*type = AUTOFS_TYPE_INDIRECT;

			break;

		case Opt_direct:

			*type = AUTOFS_TYP_DIRECT;

			*type = AUTOFS_TYPE_DIRECT;

			break;

		case Opt_offset:

			*type = AUTOFS_TYP_DIRECT | AUTOFS_TYP_OFFSET;

			*type = AUTOFS_TYPE_DIRECT | AUTOFS_TYPE_OFFSET;

			break;

		default:

			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_op = sbi->type & AUTOFS_TYP_DIRECT ?

	root_inode->i_op = sbi->type & AUTOFS_TYPE_DIRECT ?

			&autofs4_direct_root_inode_operations :

			&autofs4_indirect_root_inode_operations;

fs/autofs4/waitq.c

+3 −3
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry, 
		return -ENOMEM;



	/* 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);

	else {

		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;

		} else {

			if (notify == NFY_MOUNT)

				type = (sbi->type & AUTOFS_TYP_DIRECT) ?

				type = (sbi->type & AUTOFS_TYPE_DIRECT) ?

					autofs_ptype_missing_direct :

					 autofs_ptype_missing_indirect;

			else

				type = (sbi->type & AUTOFS_TYP_DIRECT) ?

				type = (sbi->type & AUTOFS_TYPE_DIRECT) ?

					autofs_ptype_expire_direct :

					autofs_ptype_expire_indirect;

		}