io_uring: get rid of __req_need_defer()
authorJens Axboe <axboe@kernel.dk>
Thu, 9 Jul 2020 15:43:27 +0000 (09:43 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 9 Jul 2020 15:43:27 +0000 (09:43 -0600)
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>
fs/io_uring.c

index 51ff88330f9a8829c3de10dafc7d78f78fafa9c9..7f2a2cb5c05681081f3e25f174676c5065370fcb 100644 (file)
@@ -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;
 }