From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 2 Dec 2021 19:42:58 +0000 (-0700)
Subject: block: get rid of useless goto and label in blk_mq_get_new_requests()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=373b5416b4b03ebda5d8f0605b81eff0dc76ebcf;p=linux.git

block: get rid of useless goto and label in blk_mq_get_new_requests()

Expected case is returning a request, just check for success and return
the request rather than having an error label.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-mq.c b/block/blk-mq.c
index ecfc47fad2368..ca33cb755c5f6 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2720,11 +2720,8 @@ static struct request *blk_mq_get_new_requests(struct request_queue *q,
 	}
 
 	rq = __blk_mq_alloc_requests(&data);
-	if (!rq)
-		goto fail;
-	return rq;
-
-fail:
+	if (rq)
+		return rq;
 	rq_qos_cleanup(q, bio);
 	if (bio->bi_opf & REQ_NOWAIT)
 		bio_wouldblock_error(bio);