Commit c36d6414 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov

ceph: reorganize fields in ceph_mds_request

This shrinks the struct size by 16 bytes.
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent cb03c143
...@@ -263,6 +263,7 @@ struct ceph_mds_request { ...@@ -263,6 +263,7 @@ struct ceph_mds_request {
int r_fmode; /* file mode, if expecting cap */ int r_fmode; /* file mode, if expecting cap */
kuid_t r_uid; kuid_t r_uid;
kgid_t r_gid; kgid_t r_gid;
int r_request_release_offset;
struct timespec64 r_stamp; struct timespec64 r_stamp;
/* for choosing which mds to send this request to */ /* for choosing which mds to send this request to */
...@@ -280,11 +281,12 @@ struct ceph_mds_request { ...@@ -280,11 +281,12 @@ struct ceph_mds_request {
int r_old_inode_drop, r_old_inode_unless; int r_old_inode_drop, r_old_inode_unless;
struct ceph_msg *r_request; /* original request */ struct ceph_msg *r_request; /* original request */
int r_request_release_offset;
struct ceph_msg *r_reply; struct ceph_msg *r_reply;
struct ceph_mds_reply_info_parsed r_reply_info; struct ceph_mds_reply_info_parsed r_reply_info;
struct page *r_locked_page; struct page *r_locked_page;
int r_err; int r_err;
int r_num_caps;
u32 r_readdir_offset;
unsigned long r_timeout; /* optional. jiffies, 0 is "wait forever" */ unsigned long r_timeout; /* optional. jiffies, 0 is "wait forever" */
unsigned long r_started; /* start time to measure timeout against */ unsigned long r_started; /* start time to measure timeout against */
...@@ -315,10 +317,8 @@ struct ceph_mds_request { ...@@ -315,10 +317,8 @@ struct ceph_mds_request {
long long r_dir_release_cnt; long long r_dir_release_cnt;
long long r_dir_ordered_cnt; long long r_dir_ordered_cnt;
int r_readdir_cache_idx; int r_readdir_cache_idx;
u32 r_readdir_offset;
struct ceph_cap_reservation r_caps_reservation; struct ceph_cap_reservation r_caps_reservation;
int r_num_caps;
}; };
struct ceph_pool_perm { struct ceph_pool_perm {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment