Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 180040
b: refs/heads/master
c: 217686e
h: refs/heads/master
v: v3
  • Loading branch information
Al Viro committed Jan 27, 2010
1 parent 2073222 commit 5694a87
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 29333920a5a46edcc9b728e2cf0134d5a9b516ee
refs/heads/master: 217686e98321a4ff4c1a6cc535e511e37c5d2dbf
12 changes: 6 additions & 6 deletions trunk/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 5694a87

Please sign in to comment.