Commit 3fcf2581 authored by Alex Elder's avatar Alex Elder
Browse files

rbd: assign header name later 



Move the assignment of the header name for an rbd image a bit later,
outside rbd_add_parse_args() and into its caller.

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

drivers/block/rbd.c

+10 −12
Original line number Diff line number Diff line
@@ -2474,15 +2474,6 @@ static char *rbd_add_parse_args(struct rbd_device *rbd_dev, 
	if (!rbd_dev->image_name)

		goto out_err;



	/* Create the name of the header object */



	rbd_dev->header_name = kmalloc(rbd_dev->image_name_len

						+ sizeof (RBD_SUFFIX),

					GFP_KERNEL);

	if (!rbd_dev->header_name)

		goto out_err;

	sprintf(rbd_dev->header_name, "%s%s", rbd_dev->image_name, RBD_SUFFIX);



	/* Snapshot name is optional */

	len = next_token(&buf);

	if (!len) {
@@ -2500,8 +2491,6 @@ dout(" SNAP_NAME is <%s>, len is %zd\n", snap_name, len); 
	return snap_name;



out_err:

	kfree(rbd_dev->header_name);

	rbd_dev->header_name = NULL;

	kfree(rbd_dev->image_name);

	rbd_dev->image_name = NULL;

	rbd_dev->image_name_len = 0;
@@ -2566,6 +2555,15 @@ static ssize_t rbd_add(struct bus_type *bus, 
		goto err_out_client;

	rbd_dev->pool_id = rc;



	/* Create the name of the header object */



	rbd_dev->header_name = kmalloc(rbd_dev->image_name_len

						+ sizeof (RBD_SUFFIX),

					GFP_KERNEL);

	if (!rbd_dev->header_name)

		goto err_out_client;

	sprintf(rbd_dev->header_name, "%s%s", rbd_dev->image_name, RBD_SUFFIX);



	/* register our block device */

	rc = register_blkdev(0, rbd_dev->name);

	if (rc < 0)
@@ -2626,11 +2624,11 @@ static ssize_t rbd_add(struct bus_type *bus, 
err_out_blkdev:

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

err_out_client:

	kfree(rbd_dev->header_name);

	rbd_put_client(rbd_dev);

err_put_id:

	if (rbd_dev->pool_name) {

		kfree(rbd_dev->mapping.snap_name);

		kfree(rbd_dev->header_name);

		kfree(rbd_dev->image_name);

		kfree(rbd_dev->pool_name);

	}