libceph: calculate placement based on the internal data types

Instead of using the old ceph_object_layout struct, update our internal
ceph_calc_object_layout method to use the ceph_pg type.  This allows us to
pass the full 32-bit precision of the pgid.seed to the callers.  It also
allows some callers to avoid reaching into the request structures for the
struct ceph_object_layout fields.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>

2 files changed, 12 insertions, 17 deletions

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 1990834e518b..5584f0a08e28 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -913,21 +913,18 @@ EXPORT_SYMBOL(ceph_osdc_set_request_linger);
 static int __map_request(struct ceph_osd_client *osdc,
                          struct ceph_osd_request *req, int force_resend)
 {
-        struct ceph_osd_request_head *reqhead = req->r_request->front.iov_base;
         struct ceph_pg pgid;
         int acting[CEPH_PG_MAX_SIZE];
         int o = -1, num = 0;
         int err;
 
         dout("map_request %p tid %lld\n", req, req->r_tid);
-        err = ceph_calc_object_layout(&reqhead->layout, req->r_oid,
+        err = ceph_calc_object_layout(&pgid, req->r_oid,
                                       &req->r_file_layout, osdc->osdmap);
         if (err) {
                 list_move(&req->r_req_lru_item, &osdc->req_notarget);
                 return err;
         }
-        pgid.pool = le32_to_cpu(reqhead->layout.ol_pgid.pool);
-        pgid.seed = le16_to_cpu(reqhead->layout.ol_pgid.ps);
         req->r_pgid = pgid;
 
         err = ceph_calc_pg_acting(osdc->osdmap, pgid, acting);
@@ -1000,10 +997,16 @@ static void __send_request(struct ceph_osd_client *osdc,
              req, req->r_tid, req->r_osd->o_osd, req->r_flags);
 
         reqhead = req->r_request->front.iov_base;
+        reqhead->snapid = cpu_to_le64(req->r_snapid);
         reqhead->osdmap_epoch = cpu_to_le32(osdc->osdmap->epoch);
         reqhead->flags |= cpu_to_le32(req->r_flags);  /* e.g., RETRY */
         reqhead->reassert_version = req->r_reassert_version;
 
+        reqhead->layout.ol_pgid.ps = cpu_to_le16(req->r_pgid.seed);
+        reqhead->layout.ol_pgid.pool = cpu_to_le32(req->r_pgid.pool);
+        reqhead->layout.ol_pgid.preferred = cpu_to_le16(-1);
+        reqhead->layout.ol_stripe_unit = 0;
+
         req->r_stamp = jiffies;
         list_move_tail(&req->r_req_lru_item, &osdc->req_lru);
 
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index 911919320d2e..378471644501 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -1095,32 +1095,24 @@ EXPORT_SYMBOL(ceph_calc_file_object_mapping);
  * calculate an object layout (i.e. pgid) from an oid,
  * file_layout, and osdmap
  */
-int ceph_calc_object_layout(struct ceph_object_layout *ol,
+int ceph_calc_object_layout(struct ceph_pg *pg,
                             const char *oid,
                             struct ceph_file_layout *fl,
                             struct ceph_osdmap *osdmap)
 {
         unsigned int num, num_mask;
-        struct ceph_pg pgid;
         struct ceph_pg_pool_info *pool;
 
         BUG_ON(!osdmap);
-
-        pgid.pool = le32_to_cpu(fl->fl_pg_pool);
-        pool = __lookup_pg_pool(&osdmap->pg_pools, pgid.pool);
+        pg->pool = le32_to_cpu(fl->fl_pg_pool);
+        pool = __lookup_pg_pool(&osdmap->pg_pools, pg->pool);
         if (!pool)
                 return -EIO;
-        pgid.seed = ceph_str_hash(pool->object_hash, oid, strlen(oid));
+        pg->seed = ceph_str_hash(pool->object_hash, oid, strlen(oid));
         num = pool->pg_num;
         num_mask = pool->pg_num_mask;
 
-        dout("calc_object_layout '%s' pgid %lld.%x\n", oid, pgid.pool,
-             pgid.seed);
-
-        ol->ol_pgid.ps = cpu_to_le16(pgid.seed);
-        ol->ol_pgid.pool = fl->fl_pg_pool;
-        ol->ol_pgid.preferred = cpu_to_le16(-1);
-        ol->ol_stripe_unit = fl->fl_object_stripe_unit;
+        dout("calc_object_layout '%s' pgid %lld.%x\n", oid, pg->pool, pg->seed);
         return 0;
 }
 EXPORT_SYMBOL(ceph_calc_object_layout);