diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2024-04-05 18:50:05 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-04-15 17:10:26 +0300 |
| commit | c29006a2456bc9c2aea09e4a8958b4d9a7dfcb5a (patch) | |
| tree | 54eed527c821cc6dda73adb1e857dbe37e2f5cc8 /io_uring | |
| parent | d9713ad3fa227726a0b4d544c5a4cdd393c1933e (diff) | |
| download | linux-c29006a2456bc9c2aea09e4a8958b4d9a7dfcb5a.tar.xz | |
io_uring: remove io_req_put_rsrc_locked()
io_req_put_rsrc_locked() is a weird shim function around
io_req_put_rsrc(). All calls to io_req_put_rsrc() require holding
->uring_lock, so we can just use it directly.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/a195bc78ac3d2c6fbaea72976e982fe51e50ecdd.1712331455.git.asml.silence@gmail.com
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/io_uring.c | 5 | ||||
| -rw-r--r-- | io_uring/rsrc.h | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index e291f227a1a0..9d389bd89006 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -1449,10 +1449,9 @@ static void io_free_batch_list(struct io_ring_ctx *ctx, io_clean_op(req); } io_put_file(req); - - io_req_put_rsrc_locked(req, ctx); - + io_put_rsrc_node(ctx, req->rsrc_node); io_put_task(req->task); + node = req->comp_list.next; io_req_add_to_cache(req, ctx); } while (node); diff --git a/io_uring/rsrc.h b/io_uring/rsrc.h index 83c079a707f8..c032ca3436ca 100644 --- a/io_uring/rsrc.h +++ b/io_uring/rsrc.h @@ -83,12 +83,6 @@ static inline void io_put_rsrc_node(struct io_ring_ctx *ctx, struct io_rsrc_node io_rsrc_node_ref_zero(node); } -static inline void io_req_put_rsrc_locked(struct io_kiocb *req, - struct io_ring_ctx *ctx) -{ - io_put_rsrc_node(ctx, req->rsrc_node); -} - static inline void io_charge_rsrc_node(struct io_ring_ctx *ctx, struct io_rsrc_node *node) { |