libceph: fold [l]req->last_force_resend into ceph_osd_request_target

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 85650b415e73..ef630ebd1169 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -148,6 +148,8 @@ struct ceph_osd_request_target {
         unsigned int flags;                /* CEPH_OSD_FLAG_* */
         bool paused;
 
+        u32 last_force_resend;
+
         int osd;
 };
 
@@ -193,7 +195,6 @@ struct ceph_osd_request {
         unsigned long r_stamp;                /* jiffies, send or check time */
         unsigned long r_start_stamp;          /* jiffies */
         int r_attempts;
-        u32 r_last_force_resend;
         u32 r_map_dne_bound;
 
         struct ceph_osd_req_op r_ops[];
@@ -221,7 +222,6 @@ struct ceph_osd_linger_request {
         struct list_head pending_lworks;
 
         struct ceph_osd_request_target t;
-        u32 last_force_resend;
         u32 map_dne_bound;
 
         struct timespec mtime;