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

Commit 86992098 authored by Alex Elder's avatar Alex Elder
Browse files

rbd: make pool_id a 64 bit value 



If a format 2 image has a parent, its pool id will be specified
using a 64-bit value.  Change the pool id we save for an image to
match that.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 41f38c2b

drivers/block/rbd.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -197,7 +197,7 @@ struct rbd_device { 
	size_t			image_name_len;

	size_t			image_name_len;

	char			*header_name;

	char			*header_name;

	char			*pool_name;

	char			*pool_name;

	int			pool_id;

	u64			pool_id;





	struct ceph_osd_event   *watch_event;

	struct ceph_osd_event   *watch_event;

	struct ceph_osd_request *watch_request;

	struct ceph_osd_request *watch_request;
@@ -1113,7 +1113,7 @@ static int rbd_do_request(struct request *rq, 
	layout->fl_stripe_unit = cpu_to_le32(1 << RBD_MAX_OBJ_ORDER);

	layout->fl_stripe_unit = cpu_to_le32(1 << RBD_MAX_OBJ_ORDER);

	layout->fl_stripe_count = cpu_to_le32(1);

	layout->fl_stripe_count = cpu_to_le32(1);

	layout->fl_object_size = cpu_to_le32(1 << RBD_MAX_OBJ_ORDER);

	layout->fl_object_size = cpu_to_le32(1 << RBD_MAX_OBJ_ORDER);

	layout->fl_pg_pool = cpu_to_le32(rbd_dev->pool_id);

	layout->fl_pg_pool = cpu_to_le32((int) rbd_dev->pool_id);

	ret = ceph_calc_raw_layout(osdc, layout, snapid, ofs, &len, &bno,

	ret = ceph_calc_raw_layout(osdc, layout, snapid, ofs, &len, &bno,

				   req, ops);

				   req, ops);

	rbd_assert(ret == 0);

	rbd_assert(ret == 0);
@@ -1982,7 +1982,7 @@ static ssize_t rbd_pool_id_show(struct device *dev, 
{

{

	struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);

	struct rbd_device *rbd_dev = dev_to_rbd_dev(dev);





	return sprintf(buf, "%d\n", rbd_dev->pool_id);

	return sprintf(buf, "%llu\n", (unsigned long long) rbd_dev->pool_id);

}

}





static ssize_t rbd_name_show(struct device *dev,

static ssize_t rbd_name_show(struct device *dev,
@@ -3170,7 +3170,7 @@ static ssize_t rbd_add(struct bus_type *bus, 
	rc = ceph_pg_poolid_by_name(osdc->osdmap, rbd_dev->pool_name);

	rc = ceph_pg_poolid_by_name(osdc->osdmap, rbd_dev->pool_name);

	if (rc < 0)

	if (rc < 0)

		goto err_out_client;

		goto err_out_client;

	rbd_dev->pool_id = rc;

	rbd_dev->pool_id = (u64) rc;





	rc = rbd_dev_probe(rbd_dev);

	rc = rbd_dev_probe(rbd_dev);

	if (rc < 0)

	if (rc < 0)