Commit 04be60b5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-cgroup: consolidate error handling in blkcg_init_queue 



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

Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b6676f65

block/blk-cgroup.c

+10 −12
Original line number Diff line number Diff line
@@ -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) {

	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();