2 files changed, 3 insertions, 3 deletions

diff --git a/fs/fat/file.c b/fs/fat/file.c
index f06a4e525ece..0a7f4a9918b3 100644
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -304,7 +304,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/fs/fat/inode.c b/fs/fat/inode.c
index 37a8af159a13..6b74d09adbe5 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -928,8 +928,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;