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

Commit d1cf5788 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

rbd: set mapping info earlier 



Set the mapping size and features earlier in rbd_dev_probe_finish().

Define rbd_dev_mapping_clear() as an inverse for setting those
fields, and use it both in error handling in rbd_dev_image_probe()
and in the final cleanup in rbd_dev_release().  Change the name
of rbd_dev_set_mapping() to of rbd_dev_mapping_set().

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

drivers/block/rbd.c

+15 −6
Original line number Original line Diff line number Diff line
@@ -866,7 +866,7 @@ static struct rbd_snap *snap_by_name(struct rbd_device *rbd_dev, 
	return NULL;

	return NULL;

}

}





static int rbd_dev_set_mapping(struct rbd_device *rbd_dev)

static int rbd_dev_mapping_set(struct rbd_device *rbd_dev)

{

{

	if (!memcmp(rbd_dev->spec->snap_name, RBD_SNAP_HEAD_NAME,

	if (!memcmp(rbd_dev->spec->snap_name, RBD_SNAP_HEAD_NAME,

		    sizeof (RBD_SNAP_HEAD_NAME))) {

		    sizeof (RBD_SNAP_HEAD_NAME))) {
@@ -886,6 +886,13 @@ static int rbd_dev_set_mapping(struct rbd_device *rbd_dev) 
	return 0;

	return 0;

}

}





static void rbd_dev_mapping_clear(struct rbd_device *rbd_dev)

{

	rbd_dev->mapping.size = 0;

	rbd_dev->mapping.features = 0;

	rbd_dev->mapping.read_only = true;

}



static void rbd_header_free(struct rbd_image_header *header)

static void rbd_header_free(struct rbd_image_header *header)

{

{

	kfree(header->object_prefix);

	kfree(header->object_prefix);
@@ -4757,7 +4764,11 @@ static int rbd_dev_probe_finish(struct rbd_device *rbd_dev) 
	if (ret)

	if (ret)

		goto err_out_snaps;

		goto err_out_snaps;





	ret = rbd_dev_set_mapping(rbd_dev);

	ret = rbd_dev_header_watch_sync(rbd_dev, 1);

	if (ret)

		goto err_out_snaps;



	ret = rbd_dev_mapping_set(rbd_dev);

	if (ret)

	if (ret)

		goto err_out_snaps;

		goto err_out_snaps;
@@ -4790,10 +4801,6 @@ static int rbd_dev_probe_finish(struct rbd_device *rbd_dev) 
	if (ret)

	if (ret)

		goto err_out_bus;

		goto err_out_bus;





	ret = rbd_dev_header_watch_sync(rbd_dev, 1);

	if (ret)

		goto err_out_bus;



	/* Everything's ready.  Announce the disk to the world. */

	/* Everything's ready.  Announce the disk to the world. */





	set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE);

	set_capacity(rbd_dev->disk, rbd_dev->mapping.size / SECTOR_SIZE);
@@ -4817,6 +4824,7 @@ static int rbd_dev_probe_finish(struct rbd_device *rbd_dev) 
	unregister_blkdev(rbd_dev->major, rbd_dev->name);

	unregister_blkdev(rbd_dev->major, rbd_dev->name);

err_out_id:

err_out_id:

	rbd_dev_id_put(rbd_dev);

	rbd_dev_id_put(rbd_dev);

	rbd_dev_mapping_clear(rbd_dev);

err_out_snaps:

err_out_snaps:

	rbd_remove_all_snaps(rbd_dev);

	rbd_remove_all_snaps(rbd_dev);
@@ -4974,6 +4982,7 @@ static void rbd_dev_release(struct device *dev) 




	/* done with the id, and with the rbd_dev */

	/* done with the id, and with the rbd_dev */

	rbd_dev_id_put(rbd_dev);

	rbd_dev_id_put(rbd_dev);

	rbd_dev_mapping_clear(rbd_dev);

	rbd_assert(rbd_dev->rbd_client != NULL);

	rbd_assert(rbd_dev->rbd_client != NULL);

	rbd_spec_put(rbd_dev->parent_spec);

	rbd_spec_put(rbd_dev->parent_spec);

	kfree(rbd_dev->header_name);

	kfree(rbd_dev->header_name);