1 files changed, 5 insertions, 4 deletions

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 2f41a1a2f888..8750cdb6e512 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -690,8 +690,8 @@ xfs_ialloc(
         ip->i_d.di_onlink = 0;
         ip->i_d.di_nlink = nlink;
         ASSERT(ip->i_d.di_nlink == nlink);
-        ip->i_d.di_uid = current_fsuid();
-        ip->i_d.di_gid = current_fsgid();
+        ip->i_d.di_uid = xfs_kuid_to_uid(current_fsuid());
+        ip->i_d.di_gid = xfs_kgid_to_gid(current_fsgid());
         xfs_set_projid(ip, prid);
         memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
 
@@ -730,7 +730,7 @@ xfs_ialloc(
          */
         if ((irix_sgid_inherit) &&
             (ip->i_d.di_mode & S_ISGID) &&
-            (!in_group_p((gid_t)ip->i_d.di_gid))) {
+            (!in_group_p(xfs_gid_to_kgid(ip->i_d.di_gid)))) {
                 ip->i_d.di_mode &= ~S_ISGID;
         }
 
@@ -1178,7 +1178,8 @@ xfs_create(
         /*
          * Make sure that we have allocated dquot(s) on disk.
          */
-        error = xfs_qm_vop_dqalloc(dp, current_fsuid(), current_fsgid(), prid,
+        error = xfs_qm_vop_dqalloc(dp, xfs_kuid_to_uid(current_fsuid()),
+                                        xfs_kgid_to_gid(current_fsgid()), prid,
                                         XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT,
                                         &udqp, &gdqp, &pdqp);
         if (error)