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

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

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 16010183b703609e09ccbfb446f728409cea31be..0191a3ca546050781a0cf486445c143c6ec13214 100644 (file)
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -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 @@ out:
        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;
 }