Commit 8b679ec5 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

rbd: move rbd_dev_destroy() call out of rbd_dev_image_release() 



... to simplify error handling in do_rbd_add().

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarJason Dillaman <dillaman@redhat.com>
parent 26544c62

drivers/block/rbd.c

+5 −5
Original line number Diff line number Diff line
@@ -5967,8 +5967,6 @@ static void rbd_dev_image_release(struct rbd_device *rbd_dev) 
	rbd_dev->image_format = 0;

	kfree(rbd_dev->spec->image_id);

	rbd_dev->spec->image_id = NULL;



	rbd_dev_destroy(rbd_dev);

}



/*
@@ -6135,8 +6133,7 @@ static ssize_t do_rbd_add(struct bus_type *bus, 
		 * commit 1f3ef78861ac.

		 */

		rbd_unregister_watch(rbd_dev);

		rbd_dev_image_release(rbd_dev);

		goto out;

		goto err_out_image_probe;

	}



	rc = count;
@@ -6144,6 +6141,8 @@ static ssize_t do_rbd_add(struct bus_type *bus, 
	module_put(THIS_MODULE);

	return rc;



err_out_image_probe:

	rbd_dev_image_release(rbd_dev);

err_out_rbd_dev:

	rbd_dev_destroy(rbd_dev);

err_out_client:
@@ -6203,6 +6202,7 @@ static void rbd_dev_remove_parent(struct rbd_device *rbd_dev) 
		}

		rbd_assert(second);

		rbd_dev_image_release(second);

		rbd_dev_destroy(second);

		first->parent = NULL;

		first->parent_overlap = 0;
@@ -6285,7 +6285,7 @@ static ssize_t do_rbd_remove(struct bus_type *bus, 
	 */

	rbd_dev_device_release(rbd_dev);

	rbd_dev_image_release(rbd_dev);



	rbd_dev_destroy(rbd_dev);

	return count;

}