summaryrefslogtreecommitdiffstats
path: root/fs/io_uring.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2020-07-09 17:43:27 +0200
committerJens Axboe <axboe@kernel.dk>2020-07-09 17:43:27 +0200
commit2bc9930e78fe0cb3e7b7e3169de0a40baee38d29 (patch)
tree96e41943c9447a6e5fc6ecc7951078d552f4e911 /fs/io_uring.c
parentio_uring: only call kfree() for a non-zero pointer (diff)
downloadlinux-2bc9930e78fe0cb3e7b7e3169de0a40baee38d29.tar.xz
linux-2bc9930e78fe0cb3e7b7e3169de0a40baee38d29.zip
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>
Diffstat (limited to 'fs/io_uring.c')
-rw-r--r--fs/io_uring.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 51ff88330f9a..7f2a2cb5c056 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;
}