libceph: generalize ceph_pg_mapping

In preparation for adding support for primary_temp mappings, generalize
struct ceph_pg_mapping so it can hold mappings other than pg_temp.

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index be2a65fbd902..c67a309fdfc2 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -822,9 +822,9 @@ static int __decode_pg_temp(void **p, void *end, struct ceph_osdmap *map,
                                 return -ENOMEM;
 
                         pg->pgid = pgid;
-                        pg->len = len;
+                        pg->pg_temp.len = len;
                         for (i = 0; i < len; i++)
-                                pg->osds[i] = ceph_decode_32(p);
+                                pg->pg_temp.osds[i] = ceph_decode_32(p);
 
                         ret = __insert_pg_mapping(pg, &map->pg_temp);
                         if (ret) {
@@ -1281,8 +1281,8 @@ static int *calc_pg_raw(struct ceph_osdmap *osdmap, struct ceph_pg pgid,
                                     pool->pg_num_mask);
         pg = __lookup_pg_mapping(&osdmap->pg_temp, pgid);
         if (pg) {
-                *num = pg->len;
-                return pg->osds;
+                *num = pg->pg_temp.len;
+                return pg->pg_temp.osds;
         }
 
         /* crush */