Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d286de79 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Sage Weil
Browse files

libceph: primary_temp decode bits 



Add a common helper to decode both primary_temp (full map, map<pg_t,
u32>) and new_primary_temp (inc map, same) and switch to it.

Signed-off-by: default avatarIlya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
parent 9686f94c

net/ceph/osdmap.c

+69 −0
Original line number Diff line number Diff line
@@ -857,6 +857,61 @@ static int decode_new_pg_temp(void **p, void *end, struct ceph_osdmap *map) 
	return __decode_pg_temp(p, end, map, true);

}



static int __decode_primary_temp(void **p, void *end, struct ceph_osdmap *map,

				 bool incremental)

{

	u32 n;



	ceph_decode_32_safe(p, end, n, e_inval);

	while (n--) {

		struct ceph_pg pgid;

		u32 osd;

		int ret;



		ret = ceph_decode_pgid(p, end, &pgid);

		if (ret)

			return ret;



		ceph_decode_32_safe(p, end, osd, e_inval);



		ret = __remove_pg_mapping(&map->primary_temp, pgid);

		BUG_ON(!incremental && ret != -ENOENT);



		if (!incremental || osd != (u32)-1) {

			struct ceph_pg_mapping *pg;



			pg = kzalloc(sizeof(*pg), GFP_NOFS);

			if (!pg)

				return -ENOMEM;



			pg->pgid = pgid;

			pg->primary_temp.osd = osd;



			ret = __insert_pg_mapping(pg, &map->primary_temp);

			if (ret) {

				kfree(pg);

				return ret;

			}

		}

	}



	return 0;



e_inval:

	return -EINVAL;

}



static int decode_primary_temp(void **p, void *end, struct ceph_osdmap *map)

{

	return __decode_primary_temp(p, end, map, false);

}



static int decode_new_primary_temp(void **p, void *end,

				   struct ceph_osdmap *map)

{

	return __decode_primary_temp(p, end, map, true);

}



/*

 * decode a full map.

 */
@@ -933,6 +988,13 @@ static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map) 
	if (err)

		goto bad;



	/* primary_temp */

	if (struct_v >= 1) {

		err = decode_primary_temp(p, end, map);

		if (err)

			goto bad;

	}



	/* crush */

	ceph_decode_32_safe(p, end, len, e_inval);

	map->crush = crush_decode(*p, min(*p + len, end));
@@ -1133,6 +1195,13 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, 
	if (err)

		goto bad;



	/* new_primary_temp */

	if (struct_v >= 1) {

		err = decode_new_primary_temp(p, end, map);

		if (err)

			goto bad;

	}



	/* ignore the rest */

	*p = end;