Skip to content

Commit

Permalink
ceph: fix uid/gid on resent mds requests
Browse files Browse the repository at this point in the history
MDS requests can be rebuilt and resent in non-process context, but were
filling in uid/gid from current_fsuid/gid.  Put that information in the
request struct on request setup.

This fixes incorrect (and root) uid/gid getting set for requests that
are forwarded between MDSs, usually due to metadata migrations.

Signed-off-by: Sage Weil <[email protected]>
  • Loading branch information
liewegas committed Nov 8, 2010
1 parent cd045cb commit cb4276c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 5 additions & 2 deletions fs/ceph/mds_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,9 @@ static void __register_request(struct ceph_mds_client *mdsc,
ceph_mdsc_get_request(req);
__insert_request(mdsc, req);

req->r_uid = current_fsuid();
req->r_gid = current_fsgid();

if (dir) {
struct ceph_inode_info *ci = ceph_inode(dir);

Expand Down Expand Up @@ -1588,8 +1591,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(current_fsuid());
head->caller_gid = cpu_to_le32(current_fsgid());
head->caller_uid = cpu_to_le32(req->r_uid);
head->caller_gid = cpu_to_le32(req->r_gid);
head->args = req->r_args;

ceph_encode_filepath(&p, end, ino1, path1);
Expand Down
2 changes: 2 additions & 0 deletions fs/ceph/mds_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,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;

/* for choosing which mds to send this request to */
int r_direct_mode;
Expand Down

0 comments on commit cb4276c

Please sign in to comment.