iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ceph: close holes in structs ceph_mds_session and ceph_mds_request

Browse Source 
Move s_ref up to plug a 4 byte hole, which plugs another.
Move r_kref to shave 8 bytes off per request on x86_64.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Jeff Layton 2019-11-15 09:13:59 -05:00 committed by Ilya Dryomov
parent a55e601b2f
commit 045100cd79
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ceph/mds_client.h
View File

@ -184,6 +184,7 @@ struct ceph_mds_session {
/* protected by s_cap_lock */ /* protected by s_cap_lock */
spinlock_t s_cap_lock; spinlock_t s_cap_lock;
refcount_t s_ref;
struct list_head s_caps; /* all caps issued by this session */ struct list_head s_caps; /* all caps issued by this session */
struct ceph_cap *s_cap_iterator; struct ceph_cap *s_cap_iterator;
int s_nr_caps; int s_nr_caps;
@ -198,7 +199,6 @@ struct ceph_mds_session {
unsigned long s_renew_requested; /* last time we sent a renew req */ unsigned long s_renew_requested; /* last time we sent a renew req */
u64 s_renew_seq; u64 s_renew_seq;
refcount_t s_ref;
struct list_head s_waiting; /* waiting requests */ struct list_head s_waiting; /* waiting requests */
struct list_head s_unsafe; /* unsafe requests */ struct list_head s_unsafe; /* unsafe requests */
}; };
@ -234,6 +234,7 @@ struct ceph_mds_request {
struct rb_node r_node; struct rb_node r_node;
struct ceph_mds_client *r_mdsc; struct ceph_mds_client *r_mdsc;
struct kref r_kref;
int r_op; /* mds op code */ int r_op; /* mds op code */
/* operation on what? */ /* operation on what? */
@ -304,7 +305,6 @@ struct ceph_mds_request {
int r_resend_mds; /* mds to resend to next, if any*/ int r_resend_mds; /* mds to resend to next, if any*/
u32 r_sent_on_mseq; /* cap mseq request was sent at*/ u32 r_sent_on_mseq; /* cap mseq request was sent at*/
struct kref r_kref;
struct list_head r_wait; struct list_head r_wait;
struct completion r_completion; struct completion r_completion;
struct completion r_safe_completion; struct completion r_safe_completion;