From c6d6c0b4805ac3c7399d85058b5fc49ec0254b03 Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Thu, 31 Jan 2013 04:01:53 -0800 Subject: [PATCH] --- yaml --- r: 357764 b: refs/heads/master c: ff3d0046625c1b37df37beb8477135d44dae2823 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ceph/mds_client.c | 4 ++-- trunk/fs/ceph/mds_client.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 773508715885..87ccfd9cb820 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab871b903e9095772c219b512d9eae96c4663a5d +refs/heads/master: ff3d0046625c1b37df37beb8477135d44dae2823 diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c index 9165eb8309eb..7a3dfe0a9a80 100644 --- a/trunk/fs/ceph/mds_client.c +++ b/trunk/fs/ceph/mds_client.c @@ -1658,8 +1658,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); diff --git a/trunk/fs/ceph/mds_client.h b/trunk/fs/ceph/mds_client.h index dd26846dd71d..ff4188bf6199 100644 --- a/trunk/fs/ceph/mds_client.h +++ b/trunk/fs/ceph/mds_client.h @@ -184,8 +184,8 @@ struct ceph_mds_request { union ceph_mds_request_args r_args; int r_fmode; /* file mode, if expecting cap */ - uid_t r_uid; - gid_t r_gid; + kuid_t r_uid; + kgid_t r_gid; /* for choosing which mds to send this request to */ int r_direct_mode;