block/blk-cgroup: Swap the blk_throtl_init() and blk_iolatency_init() calls

Before adding more calls in this function, simplify the error path.

Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Acked-by: Tejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20210618004456.7280-3-bvanassche@acm.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index d169e2055158859f93634d0f6c168d06f6b53729..3b0f6efaa2b6208e6325600f81ec11e208a7d6d0 100644 (file)
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1183,15 +1183,14 @@ int blkcg_init_queue(struct request_queue *q)
        if (preloaded)
                radix_tree_preload_end();
 
-       ret = blk_throtl_init(q);
+       ret = blk_iolatency_init(q);
        if (ret)
                goto err_destroy_all;
 
-       ret = blk_iolatency_init(q);
-       if (ret) {
-               blk_throtl_exit(q);
+       ret = blk_throtl_init(q);
+       if (ret)
                goto err_destroy_all;
-       }
+
        return 0;
 
 err_destroy_all: