aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-20 10:14:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-20 10:14:11 -0700
commita552f0af753eb4b5bbbe9eff205fe874b04c4583 (patch)
treee4296d70d7364244ef1ae90f91ad827a4d6161a5
parentMerge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff)
parentfat: Fix the removal of opts->fs_dmask (diff)
downloadwireguard-linux-a552f0af753eb4b5bbbe9eff205fe874b04c4583.tar.xz
wireguard-linux-a552f0af753eb4b5bbbe9eff205fe874b04c4583.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6: fat: Fix the removal of opts->fs_dmask
-rw-r--r--fs/fat/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 304b411cb8bc..8970d8c49bb0 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -966,7 +966,7 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
opts->fs_uid = current_uid();
opts->fs_gid = current_gid();
- opts->fs_fmask = current_umask();
+ opts->fs_fmask = opts->fs_dmask = current_umask();
opts->allow_utime = -1;
opts->codepage = fat_default_codepage;
opts->iocharset = fat_default_iocharset;