---

yaml --- r: 120681 b: refs/heads/master c: f0ce7ee h: refs/heads/master i: 120679: ba879d3 v: v3
git-mirror · Nov 13, 2008 · 08081ff · 08081ff
1 parent 52a30d9
commit 08081ff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c9c544e4987efe6643ad5692af47a0abfd4e0d1
+refs/heads/master: f0ce7ee3a8ec1e80b6f460983ef1f26e603026f5
diff --git a/trunk/fs/fat/file.c b/trunk/fs/fat/file.c
@@ -302,7 +302,7 @@ static int fat_allow_set_time(struct msdos_sb_info *sbi, struct inode *inode)
 {
 	mode_t allow_utime = sbi->options.allow_utime;
 
-	if (current->fsuid != inode->i_uid) {
+	if (current_fsuid() != inode->i_uid) {
 		if (in_group_p(inode->i_gid))
 			allow_utime >>= 3;
 		if (allow_utime & MAY_WRITE)

diff --git a/trunk/fs/fat/inode.c b/trunk/fs/fat/inode.c
@@ -921,8 +921,8 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
 
 	opts->isvfat = is_vfat;
 
-	opts->fs_uid = current->uid;
-	opts->fs_gid = current->gid;
+	opts->fs_uid = current_uid();
+	opts->fs_gid = current_gid();
 	opts->fs_fmask = opts->fs_dmask = current->fs->umask;
 	opts->allow_utime = -1;
 	opts->codepage = fat_default_codepage;