Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346451
b: refs/heads/master
c: 5b3d5ae
h: refs/heads/master
i:
  346449: 1bb41e6
  346447: 63ec31a
v: v3
  • Loading branch information
Jan Kara authored and Linus Torvalds committed Dec 18, 2012
1 parent 1045c64 commit c4f6b08
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 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: 58156c8fbf43e71dd091848d4dbfd780d04016e6
refs/heads/master: 5b3d5aeaa333850756f41350fed2fc95912b2a4f
22 changes: 11 additions & 11 deletions trunk/fs/fat/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -972,51 +972,51 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat,
break;
case Opt_uid:
if (match_int(&args[0], &option))
return 0;
return -EINVAL;
opts->fs_uid = make_kuid(current_user_ns(), option);
if (!uid_valid(opts->fs_uid))
return 0;
return -EINVAL;
break;
case Opt_gid:
if (match_int(&args[0], &option))
return 0;
return -EINVAL;
opts->fs_gid = make_kgid(current_user_ns(), option);
if (!gid_valid(opts->fs_gid))
return 0;
return -EINVAL;
break;
case Opt_umask:
if (match_octal(&args[0], &option))
return 0;
return -EINVAL;
opts->fs_fmask = opts->fs_dmask = option;
break;
case Opt_dmask:
if (match_octal(&args[0], &option))
return 0;
return -EINVAL;
opts->fs_dmask = option;
break;
case Opt_fmask:
if (match_octal(&args[0], &option))
return 0;
return -EINVAL;
opts->fs_fmask = option;
break;
case Opt_allow_utime:
if (match_octal(&args[0], &option))
return 0;
return -EINVAL;
opts->allow_utime = option & (S_IWGRP | S_IWOTH);
break;
case Opt_codepage:
if (match_int(&args[0], &option))
return 0;
return -EINVAL;
opts->codepage = option;
break;
case Opt_flush:
opts->flush = 1;
break;
case Opt_time_offset:
if (match_int(&args[0], &option))
return 0;
return -EINVAL;
if (option < -12 * 60 || option > 12 * 60)
return 0;
return -EINVAL;
opts->tz_set = 1;
opts->time_offset = option;
break;
Expand Down

0 comments on commit c4f6b08

Please sign in to comment.