lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some coding-style errors in autofs

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

Signed-off-by: Sukadev 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Sukadev Bhattiprolu
2007-05-10 22:23:06 -07:00
committed by Linus Torvalds
parent 93ba088117
commit d78e53c89a
4 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/autofs/inode.c
View File

@@ -69,7 +69,8 @@ static match_table_t autofs_tokens = {
{Opt_err, NULL} {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; char *p;
substring_t args[MAX_OPT_ARGS]; 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; goto fail_iput;
/* Can this call block? - WTF cares? s is locked. */ /* 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"); printk("autofs: called with bogus options\n");
goto fail_dput; goto fail_dput;
} }

3
fs/autofs/root.c
View File

@@ -511,8 +511,7 @@ static inline int autofs_expire_run(struct super_block *sb,
pkt.hdr.proto_version = AUTOFS_PROTO_VERSION; pkt.hdr.proto_version = AUTOFS_PROTO_VERSION;
pkt.hdr.type = autofs_ptype_expire; pkt.hdr.type = autofs_ptype_expire;
if ( !sbi->exp_timeout || if (!sbi->exp_timeout || !(ent = autofs_expire(sb,sbi,mnt)))
!(ent = autofs_expire(sb,sbi,mnt)) )
return -EAGAIN; return -EAGAIN;
pkt.len = ent->len; pkt.len = ent->len;

10
fs/autofs4/inode.c
View File

@@ -218,8 +218,7 @@ static match_table_t tokens = {
}; };
static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid, static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,
pid_t *pgrp, unsigned int *type, pid_t *pgrp, unsigned int *type, int *minproto, int *maxproto)
int *minproto, int *maxproto)
{ {
char *p; char *p;
substring_t args[MAX_OPT_ARGS]; 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; root->d_fsdata = ino;
/* Can this call block? */ /* Can this call block? */
if (parse_options(data, &pipefd, if (parse_options(data, &pipefd, &root_inode->i_uid, &root_inode->i_gid,
&root_inode->i_uid, &root_inode->i_gid, &sbi->oz_pgrp, &sbi->type, &sbi->min_proto,
&sbi->oz_pgrp, &sbi->type, &sbi->max_proto)) {
&sbi->min_proto, &sbi->max_proto)) {
printk("autofs: called with bogus options\n"); printk("autofs: called with bogus options\n");
goto fail_dput; goto fail_dput;
} }