Skip to content

Commit

Permalink
fix affs parse_options()
Browse files Browse the repository at this point in the history
Error handling in that sucker got broken back in 2003.  If function
returns 0 on failure, it's not nice to add return -EINVAL into it.
Adding return 1 on other failure exits is also not a good thing (and
yes, original success exits with 1 and some of failure exits with 0
are still there; so's the original logics in callers).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Jan 27, 2010
1 parent 2933392 commit 217686e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions fs/affs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ parse_options(char *options, uid_t *uid, gid_t *gid, int *mode, int *reserved, s
switch (token) {
case Opt_bs:
if (match_int(&args[0], &n))
return -EINVAL;
return 0;
if (n != 512 && n != 1024 && n != 2048
&& n != 4096) {
printk ("AFFS: Invalid blocksize (512, 1024, 2048, 4096 allowed)\n");
Expand All @@ -213,7 +213,7 @@ parse_options(char *options, uid_t *uid, gid_t *gid, int *mode, int *reserved, s
break;
case Opt_mode:
if (match_octal(&args[0], &option))
return 1;
return 0;
*mode = option & 0777;
*mount_opts |= SF_SETMODE;
break;
Expand All @@ -231,21 +231,21 @@ parse_options(char *options, uid_t *uid, gid_t *gid, int *mode, int *reserved, s
break;
case Opt_reserved:
if (match_int(&args[0], reserved))
return 1;
return 0;
break;
case Opt_root:
if (match_int(&args[0], root))
return 1;
return 0;
break;
case Opt_setgid:
if (match_int(&args[0], &option))
return 1;
return 0;
*gid = option;
*mount_opts |= SF_SETGID;
break;
case Opt_setuid:
if (match_int(&args[0], &option))
return -EINVAL;
return 0;
*uid = option;
*mount_opts |= SF_SETUID;
break;
Expand Down

0 comments on commit 217686e

Please sign in to comment.