libceph: switch to calc_target(), part 1

Replace __calc_request_pg() and most of __map_request() with
calc_target() and start using req->r_t.

ceph_osdc_build_request() however still encodes base_oid, because it's
called before calc_target() is and target_oid is empty at that point in
time; a printf in osdc_show() also shows base_oid.  This is fixed in
"libceph: switch to calc_target(), part 2".

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

1 files changed, 5 insertions, 10 deletions

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 48806ee4488d..03bf9d9e1517 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -150,12 +150,13 @@ struct ceph_osd_request {
         struct list_head r_linger_item;
         struct list_head r_linger_osd_item;
         struct ceph_osd *r_osd;
-        struct ceph_pg   r_pgid;
-        int              r_pg_osds[CEPH_PG_MAX_SIZE];
-        int              r_num_pg_osds;
+
+        struct ceph_osd_request_target r_t;
+#define r_base_oid      r_t.base_oid
+#define r_base_oloc     r_t.base_oloc
+#define r_flags         r_t.flags
 
         struct ceph_msg  *r_request, *r_reply;
-        int               r_flags;     /* any additional flags for the osd */
         u32               r_sent;      /* >0 if r_request is sending/sent */
 
         /* request osd ops array  */
@@ -167,7 +168,6 @@ struct ceph_osd_request {
         __le64           *r_request_pool;
         void             *r_request_pgid;
         __le32           *r_request_attempts;
-        bool              r_paused;
         struct ceph_eversion *r_request_reassert_version;
 
         int               r_result;
@@ -186,11 +186,6 @@ struct ceph_osd_request {
         struct inode *r_inode;                /* for use by callbacks */
         void *r_priv;                         /* ditto */
 
-        struct ceph_object_locator r_base_oloc;
-        struct ceph_object_id r_base_oid;
-        struct ceph_object_locator r_target_oloc;
-        struct ceph_object_id r_target_oid;
-
         u64               r_snapid;
         unsigned long     r_stamp;            /* send OR check time */