libceph: decode into cpu-native ceph_pg type

Always decode data into our cpu-native ceph_pg type that has the correct
field widths.  Limit any remaining uses of ceph_pg_v1 to dealing with the
legacy protocol.

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

2 files changed, 9 insertions, 4 deletions

diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index be2867330e23..388158ff0cbc 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -56,7 +56,7 @@ struct ceph_osd_request {
         struct list_head r_linger_item;
         struct list_head r_linger_osd;
         struct ceph_osd *r_osd;
-        struct ceph_pg_v1 r_pgid;
+        struct ceph_pg   r_pgid;
         int              r_pg_osds[CEPH_PG_MAX_SIZE];
         int              r_num_pg_osds;
 
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index eb4989aa48e8..8a612df4c248 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -18,6 +18,11 @@
  * The map can be updated either via an incremental map (diff) describing
  * the change between two successive epochs, or as a fully encoded map.
  */
+struct ceph_pg {
+        uint64_t pool;
+        uint32_t seed;
+};
+
 struct ceph_pg_pool_info {
         struct rb_node node;
         int id;
@@ -28,7 +33,7 @@ struct ceph_pg_pool_info {
 
 struct ceph_pg_mapping {
         struct rb_node node;
-        struct ceph_pg_v1 pgid;
+        struct ceph_pg pgid;
         int len;
         int osds[];
 };
@@ -119,10 +124,10 @@ extern int ceph_calc_object_layout(struct ceph_object_layout *ol,
                                    struct ceph_file_layout *fl,
                                    struct ceph_osdmap *osdmap);
 extern int ceph_calc_pg_acting(struct ceph_osdmap *osdmap,
-                               struct ceph_pg_v1 pgid,
+                               struct ceph_pg pgid,
                                int *acting);
 extern int ceph_calc_pg_primary(struct ceph_osdmap *osdmap,
-                                struct ceph_pg_v1 pgid);
+                                struct ceph_pg pgid);
 
 extern const char *ceph_pg_pool_name_by_id(struct ceph_osdmap *map, u64 id);
 extern int ceph_pg_poolid_by_name(struct ceph_osdmap *map, const char *name);