From: Pavel Begunkov <asml.silence@gmail.com>
Date: Wed, 30 Sep 2020 19:57:01 +0000 (+0300)
Subject: io_uring: simplify io_alloc_req()
X-Git-Tag: baikal/mips/sdk5.9~12522^2~25
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=47b25f94d61fe8cdf9628fbf3897c6c3cba06517;p=kernel.git

io_uring: simplify io_alloc_req()

Extract common code from if/else branches. That is cleaner and optimised
even better.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index fcb4e95cb88d2..cdd59467576d8 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1650,10 +1650,8 @@ static struct io_kiocb *io_get_fallback_req(struct io_ring_ctx *ctx)
 static struct io_kiocb *io_alloc_req(struct io_ring_ctx *ctx,
 				     struct io_submit_state *state)
 {
-	gfp_t gfp = GFP_KERNEL | __GFP_NOWARN;
-	struct io_kiocb *req;
-
 	if (!state->free_reqs) {
+		gfp_t gfp = GFP_KERNEL | __GFP_NOWARN;
 		size_t sz;
 		int ret;
 
@@ -1670,14 +1668,11 @@ static struct io_kiocb *io_alloc_req(struct io_ring_ctx *ctx,
 				goto fallback;
 			ret = 1;
 		}
-		state->free_reqs = ret - 1;
-		req = state->reqs[ret - 1];
-	} else {
-		state->free_reqs--;
-		req = state->reqs[state->free_reqs];
+		state->free_reqs = ret;
 	}
 
-	return req;
+	state->free_reqs--;
+	return state->reqs[state->free_reqs];
 fallback:
 	return io_get_fallback_req(ctx);
 }