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>

diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index fb036ed3e1294c065193f27c0fe5115038cf4203..7d85991fd6473f79beb2e2176232aa9856654d22 100644 (file)
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -185,7 +185,6 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
                &ceph_sb_to_client(inode->i_sb)->client->osdc;
        u64 len = 1, olen;
        u64 tmp;
-       struct ceph_object_layout ol;
        struct ceph_pg pgid;
        int r;
 
@@ -209,11 +208,9 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
 
        snprintf(dl.object_name, sizeof(dl.object_name), "%llx.%08llx",
                 ceph_ino(inode), dl.object_no);
-       ceph_calc_object_layout(&ol, dl.object_name, &ci->i_layout,
+       ceph_calc_object_layout(&pgid, dl.object_name, &ci->i_layout,
                                osdc->osdmap);
 
-       pgid.pool = le32_to_cpu(ol.ol_pgid.pool);
-       pgid.seed = le16_to_cpu(ol.ol_pgid.ps);
        dl.osd = ceph_calc_pg_primary(osdc->osdmap, pgid);
        if (dl.osd >= 0) {
                struct ceph_entity_addr *a =

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 388158ff0cbc8c5ba56697dc719df659c2fc5e74..ad8899fc3157c58edf3737d3fca1b2e392657ef3 100644 (file)
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -82,6 +82,7 @@ struct ceph_osd_request {
 
        char              r_oid[MAX_OBJ_NAME_SIZE];          /* object name */
        int               r_oid_len;
+       u64               r_snapid;
        unsigned long     r_stamp;            /* send OR check time */
 
        struct ceph_file_layout r_file_layout;

diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index 8587746b7f0eb99a46a1be176b03ce663b68c8df..35985125f11840f0455e3fdd1302cfd0743c15d8 100644 (file)
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -129,7 +129,7 @@ extern int ceph_calc_file_object_mapping(struct ceph_file_layout *layout,
                                         u64 *bno, u64 *oxoff, u64 *oxlen);
 
 /* calculate mapping of object to a placement group */
-extern int ceph_calc_object_layout(struct ceph_object_layout *ol,
+extern int ceph_calc_object_layout(struct ceph_pg *pg,
                                   const char *oid,
                                   struct ceph_file_layout *fl,
                                   struct ceph_osdmap *osdmap);

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 1990834e518b041df7265bf7b416b281cced7840..5584f0a08e280fde9061f513464dfa580aea6ee4 100644 (file)
--- 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 911919320d2e1a7bf561e52648ba0c6ee0c7a8d0..37847164450136c95200579def0adfa444438867 100644 (file)
--- 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);