ceph: drop redundant r_mds field

The r_mds field is redundant, since we can find the same information at
r_session->s_mds, and when r_session is NULL then r_mds is meaningless.

Signed-off-by: Sage Weil <sage@newdream.net>

Sage Weil 4af25fdd 14303d20

+11 -7
+6 -3
fs/ceph/debugfs.c
··· 60 for (rp = rb_first(&mdsc->request_tree); rp; rp = rb_next(rp)) { 61 req = rb_entry(rp, struct ceph_mds_request, r_node); 62 63 - if (req->r_request) 64 - seq_printf(s, "%lld\tmds%d\t", req->r_tid, req->r_mds); 65 - else 66 seq_printf(s, "%lld\t(no request)\t", req->r_tid); 67 68 seq_printf(s, "%s", ceph_mds_op_name(req->r_op)); 69
··· 60 for (rp = rb_first(&mdsc->request_tree); rp; rp = rb_next(rp)) { 61 req = rb_entry(rp, struct ceph_mds_request, r_node); 62 63 + if (req->r_request && req->r_session) 64 + seq_printf(s, "%lld\tmds%d\t", req->r_tid, 65 + req->r_session->s_mds); 66 + else if (!req->r_request) 67 seq_printf(s, "%lld\t(no request)\t", req->r_tid); 68 + else 69 + seq_printf(s, "%lld\t(no session)\t", req->r_tid); 70 71 seq_printf(s, "%s", ceph_mds_op_name(req->r_op)); 72
+5 -3
fs/ceph/mds_client.c
··· 1705 struct ceph_msg *msg; 1706 int flags = 0; 1707 1708 - req->r_mds = mds; 1709 req->r_attempts++; 1710 if (req->r_inode) { 1711 struct ceph_cap *cap = ··· 2067 goto out; 2068 } else { 2069 struct ceph_inode_info *ci = ceph_inode(req->r_inode); 2070 - struct ceph_cap *cap = 2071 - ceph_get_cap_for_mds(ci, req->r_mds);; 2072 2073 dout("already using auth"); 2074 if ((!cap || cap != ci->i_auth_cap) ||
··· 1705 struct ceph_msg *msg; 1706 int flags = 0; 1707 1708 req->r_attempts++; 1709 if (req->r_inode) { 1710 struct ceph_cap *cap = ··· 2068 goto out; 2069 } else { 2070 struct ceph_inode_info *ci = ceph_inode(req->r_inode); 2071 + struct ceph_cap *cap = NULL; 2072 + 2073 + if (req->r_session) 2074 + cap = ceph_get_cap_for_mds(ci, 2075 + req->r_session->s_mds); 2076 2077 dout("already using auth"); 2078 if ((!cap || cap != ci->i_auth_cap) ||
-1
fs/ceph/mds_client.h
··· 166 struct ceph_mds_client *r_mdsc; 167 168 int r_op; /* mds op code */ 169 - int r_mds; 170 171 /* operation on what? */ 172 struct inode *r_inode; /* arg1 */
··· 166 struct ceph_mds_client *r_mdsc; 167 168 int r_op; /* mds op code */ 169 170 /* operation on what? */ 171 struct inode *r_inode; /* arg1 */