blk-cgroup: consolidate error handling in blkcg_init_queue

Use a goto label to merge two identical pieces of error handling code.

Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 3296c0b7353a60ff3ef2936f89afdd8e02102e78..717ab38a6c676805b5171920af97e91a1ef7484f 100644 (file)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1173,21 +1173,19 @@ int blkcg_init_queue(struct request_queue *q)
                radix_tree_preload_end();
 
        ret = blk_iolatency_init(q);
-       if (ret) {
-               spin_lock_irq(q->queue_lock);
-               blkg_destroy_all(q);
-               spin_unlock_irq(q->queue_lock);
-               return ret;
-       }
+       if (ret)
+               goto err_destroy_all;
 
        ret = blk_throtl_init(q);
-       if (ret) {
-               spin_lock_irq(q->queue_lock);
-               blkg_destroy_all(q);
-               spin_unlock_irq(q->queue_lock);
-       }
-       return ret;
+       if (ret)
+               goto err_destroy_all;
+       return 0;
 
+err_destroy_all:
+       spin_lock_irq(q->queue_lock);
+       blkg_destroy_all(q);
+       spin_unlock_irq(q->queue_lock);
+       return ret;
 err_unlock:
        spin_unlock_irq(q->queue_lock);
        rcu_read_unlock();