From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 9 Jul 2020 15:43:27 +0000 (-0600)
Subject: io_uring: get rid of __req_need_defer()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2bc9930e78fe0cb3e7b7e3169de0a40baee38d29;p=linux.git

io_uring: get rid of __req_need_defer()

We just have one caller of this, req_need_defer(), just inline the
code in there instead.

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

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 51ff88330f9a8..7f2a2cb5c0568 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1069,18 +1069,14 @@ err:
 	return NULL;
 }
 
-static inline bool __req_need_defer(struct io_kiocb *req)
-{
-	struct io_ring_ctx *ctx = req->ctx;
-
-	return req->sequence != ctx->cached_cq_tail
-				+ atomic_read(&ctx->cached_cq_overflow);
-}
-
 static inline bool req_need_defer(struct io_kiocb *req)
 {
-	if (unlikely(req->flags & REQ_F_IO_DRAIN))
-		return __req_need_defer(req);
+	if (unlikely(req->flags & REQ_F_IO_DRAIN)) {
+		struct io_ring_ctx *ctx = req->ctx;
+
+		return req->sequence != ctx->cached_cq_tail
+					+ atomic_read(&ctx->cached_cq_overflow);
+	}
 
 	return false;
 }