Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[karo-tx-linux.git] / fs / ceph / mds_client.c

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index d95842036c8b11b570f0c5a998087527d3b351e3..442880d099c939480583b3366eee9142e2d63d89 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1686,8 +1686,8 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,
 
        head->mdsmap_epoch = cpu_to_le32(mdsc->mdsmap->m_epoch);
        head->op = cpu_to_le32(req->r_op);
-       head->caller_uid = cpu_to_le32(req->r_uid);
-       head->caller_gid = cpu_to_le32(req->r_gid);
+       head->caller_uid = cpu_to_le32(from_kuid(&init_user_ns, req->r_uid));
+       head->caller_gid = cpu_to_le32(from_kgid(&init_user_ns, req->r_gid));
        head->args = req->r_args;
 
        ceph_encode_filepath(&p, end, ino1, path1);