1 files changed, 9 insertions, 8 deletions

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index a1d9bb30c1bf..ae2be696eb5b 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -930,7 +930,7 @@ static int send_cap_msg(struct ceph_mds_session *session,
                         u64 size, u64 max_size,
                         struct timespec *mtime, struct timespec *atime,
                         u64 time_warp_seq,
-                        uid_t uid, gid_t gid, umode_t mode,
+                        kuid_t uid, kgid_t gid, umode_t mode,
                         u64 xattr_version,
                         struct ceph_buffer *xattrs_buf,
                         u64 follows)
@@ -974,8 +974,8 @@ static int send_cap_msg(struct ceph_mds_session *session,
                 ceph_encode_timespec(&fc->atime, atime);
         fc->time_warp_seq = cpu_to_le32(time_warp_seq);
 
-        fc->uid = cpu_to_le32(uid);
-        fc->gid = cpu_to_le32(gid);
+        fc->uid = cpu_to_le32(from_kuid(&init_user_ns, uid));
+        fc->gid = cpu_to_le32(from_kgid(&init_user_ns, gid));
         fc->mode = cpu_to_le32(mode);
 
         fc->xattr_version = cpu_to_le64(xattr_version);
@@ -1081,8 +1081,8 @@ static int __send_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,
         struct timespec mtime, atime;
         int wake = 0;
         umode_t mode;
-        uid_t uid;
-        gid_t gid;
+        kuid_t uid;
+        kgid_t gid;
         struct ceph_mds_session *session;
         u64 xattr_version = 0;
         struct ceph_buffer *xattr_blob = NULL;
@@ -2359,10 +2359,11 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
 
         if ((issued & CEPH_CAP_AUTH_EXCL) == 0) {
                 inode->i_mode = le32_to_cpu(grant->mode);
-                inode->i_uid = le32_to_cpu(grant->uid);
-                inode->i_gid = le32_to_cpu(grant->gid);
+                inode->i_uid = make_kuid(&init_user_ns, le32_to_cpu(grant->uid));
+                inode->i_gid = make_kgid(&init_user_ns, le32_to_cpu(grant->gid));
                 dout("%p mode 0%o uid.gid %d.%d\n", inode, inode->i_mode,
-                     inode->i_uid, inode->i_gid);
+                     from_kuid(&init_user_ns, inode->i_uid),
+                     from_kgid(&init_user_ns, inode->i_gid));
         }
 
         if ((issued & CEPH_CAP_LINK_EXCL) == 0)