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

Commit d78e53c8 authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Linus Torvalds
Browse files

Fix some coding-style errors in autofs 



Fix coding style errors (extra spaces, long lines) in autofs and autofs4 files
being modified for container/pidspace issues.

Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Cedric Le Goater <clg@fr.ibm.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: Serge Hallyn <serue@us.ibm.com>
Cc: <containers@lists.osdl.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Ian Kent <raven@themaw.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 93ba0881

fs/autofs/inode.c

+16 −13
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ static match_table_t autofs_tokens = { 
	{Opt_err, NULL}

};



static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid, pid_t *pgrp, int *minproto, int *maxproto)

static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,

		pid_t *pgrp, int *minproto, int *maxproto)

{

	char *p;

	substring_t args[MAX_OPT_ARGS];
@@ -169,7 +170,9 @@ int autofs_fill_super(struct super_block *s, void *data, int silent) 
		goto fail_iput;



	/* Can this call block?  - WTF cares? s is locked. */

	if ( parse_options(data,&pipefd,&root_inode->i_uid,&root_inode->i_gid,&sbi->oz_pgrp,&minproto,&maxproto) ) {

	if (parse_options(data, &pipefd, &root_inode->i_uid,

				&root_inode->i_gid, &sbi->oz_pgrp, &minproto,

				&maxproto)) {

		printk("autofs: called with bogus options\n");

		goto fail_dput;

	}

fs/autofs/root.c

+38 −39
Original line number Diff line number Diff line
@@ -511,8 +511,7 @@ static inline int autofs_expire_run(struct super_block *sb, 
	pkt.hdr.proto_version = AUTOFS_PROTO_VERSION;

	pkt.hdr.type = autofs_ptype_expire;



	if ( !sbi->exp_timeout ||

	     !(ent = autofs_expire(sb,sbi,mnt)) )

	if (!sbi->exp_timeout || !(ent = autofs_expire(sb,sbi,mnt)))

		return -EAGAIN;



	pkt.len = ent->len;

fs/autofs4/inode.c

+7 −9
Original line number Diff line number Diff line
@@ -218,8 +218,7 @@ static match_table_t tokens = { 
};



static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,

			 pid_t *pgrp, unsigned int *type,

			 int *minproto, int *maxproto)

		pid_t *pgrp, unsigned int *type, int *minproto, int *maxproto)

{

	char *p;

	substring_t args[MAX_OPT_ARGS];
@@ -363,10 +362,9 @@ int autofs4_fill_super(struct super_block *s, void *data, int silent) 
	root->d_fsdata = ino;



	/* Can this call block? */

	if (parse_options(data, &pipefd,

			  &root_inode->i_uid, &root_inode->i_gid,

			  &sbi->oz_pgrp, &sbi->type,

			  &sbi->min_proto, &sbi->max_proto)) {

	if (parse_options(data, &pipefd, &root_inode->i_uid, &root_inode->i_gid,

				&sbi->oz_pgrp, &sbi->type, &sbi->min_proto,

				&sbi->max_proto)) {

		printk("autofs: called with bogus options\n");

		goto fail_dput;

	}

fs/autofs4/root.c

+9 −9

File changed.

Contains only whitespace changes.