3 files changed, 3 insertions, 4 deletions

diff --git a/fs/smbfs/dir.c b/fs/smbfs/dir.c
index 48da4fa6b7d4..e7ddd0328ddc 100644
--- a/fs/smbfs/dir.c
+++ b/fs/smbfs/dir.c
@@ -667,8 +667,7 @@ smb_make_node(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
 
         attr.ia_valid = ATTR_MODE | ATTR_UID | ATTR_GID;
         attr.ia_mode = mode;
-        attr.ia_uid = current->euid;
-        attr.ia_gid = current->egid;
+        current_euid_egid(&attr.ia_uid, &attr.ia_gid);
 
         if (!new_valid_dev(dev))
                 return -EINVAL;
diff --git a/fs/smbfs/inode.c b/fs/smbfs/inode.c
index 3528f40ffb0f..fc27fbfc5397 100644
--- a/fs/smbfs/inode.c
+++ b/fs/smbfs/inode.c
@@ -586,7 +586,7 @@ static int smb_fill_super(struct super_block *sb, void *raw_data, int silent)
                 if (parse_options(mnt, raw_data))
                         goto out_bad_option;
         }
-        mnt->mounted_uid = current->uid;
+        mnt->mounted_uid = current_uid();
         smb_setcodepage(server, &mnt->codepage);
 
         /*
diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c
index ee536e8a649a..9468168b9af5 100644
--- a/fs/smbfs/proc.c
+++ b/fs/smbfs/proc.c
@@ -864,7 +864,7 @@ smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
                 goto out;
 
         error = -EACCES;
-        if (current->uid != server->mnt->mounted_uid && 
+        if (current_uid() != server->mnt->mounted_uid &&
             !capable(CAP_SYS_ADMIN))
                 goto out;