rbd: make rbd_dev_destroy() match rbd_dev_create()

Currently, rbd_dev_destroy() does more than just the inverse of what
rbd_dev_create() does.  Stop doing that, and move the two extra
things it does into the three call sites.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index b6775ae1a770600d3b1aae17b2750d6459a8728f..e6dab9f7dd7534cde6b8c239ee4e2deebe3855e7 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3425,8 +3425,6 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc,
 
 static void rbd_dev_destroy(struct rbd_device *rbd_dev)
 {
-       rbd_spec_put(rbd_dev->parent_spec);
-       kfree(rbd_dev->header_name);
        rbd_put_client(rbd_dev->rbd_client);
        rbd_spec_put(rbd_dev->spec);
        kfree(rbd_dev);
@@ -4788,6 +4786,8 @@ static int rbd_dev_probe_finish(struct rbd_device *rbd_dev)
        return ret;
 
 err_out_parent:
+       rbd_spec_put(rbd_dev->parent_spec);
+       kfree(rbd_dev->header_name);
        rbd_dev_destroy(parent);
 err_out_spec:
        rbd_spec_put(parent_spec);
@@ -4910,6 +4910,8 @@ static ssize_t rbd_add(struct bus_type *bus,
 
        return count;
 err_out_rbd_dev:
+       rbd_spec_put(rbd_dev->parent_spec);
+       kfree(rbd_dev->header_name);
        rbd_dev_destroy(rbd_dev);
 err_out_client:
        rbd_put_client(rbdc);
@@ -4960,6 +4962,8 @@ static void rbd_dev_release(struct device *dev)
        /* done with the id, and with the rbd_dev */
        rbd_dev_id_put(rbd_dev);
        rbd_assert(rbd_dev->rbd_client != NULL);
+       rbd_spec_put(rbd_dev->parent_spec);
+       kfree(rbd_dev->header_name);
        rbd_dev_destroy(rbd_dev);
 
        /* release module ref */