2 files changed, 4 insertions, 4 deletions

diff --git a/fs/affs/inode.c b/fs/affs/inode.c
index a13b334a3910..415d9c67ac16 100644
--- a/fs/affs/inode.c
+++ b/fs/affs/inode.c
@@ -293,8 +293,8 @@ affs_new_inode(struct inode *dir)
         mark_buffer_dirty_inode(bh, inode);
         affs_brelse(bh);
 
-        inode->i_uid     = current->fsuid;
-        inode->i_gid     = current->fsgid;
+        inode->i_uid     = current_fsuid();
+        inode->i_gid     = current_fsgid();
         inode->i_ino     = block;
         inode->i_nlink   = 1;
         inode->i_mtime   = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
diff --git a/fs/affs/super.c b/fs/affs/super.c
index 8989c93193ed..a19d64b582aa 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -163,8 +163,8 @@ parse_options(char *options, uid_t *uid, gid_t *gid, int *mode, int *reserved, s
 
         /* Fill in defaults */
 
-        *uid        = current->uid;
-        *gid        = current->gid;
+        *uid        = current_uid();
+        *gid        = current_gid();
         *reserved   = 2;
         *root       = -1;
         *blocksize  = -1;