| Message ID | 20230810162346.54872-4-axboe@kernel.dk (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Misc cleanups | expand |
On 8/10/23 10:23 AM, Jens Axboe wrote: > No functional changes in this patch, just a prep patch for needing the > request in io_file_put(). Gah, that was an older version. Newer version checks the REQ_F_FIXED_FILE flag in the helper instead: commit 17bc28374cd06b7d2d3f1e88470ef89f9cd3a497 Author: Jens Axboe <axboe@kernel.dk> Date: Fri Jul 7 11:14:40 2023 -0600 io_uring: have io_file_put() take an io_kiocb rather than the file No functional changes in this patch, just a prep patch for needing the request in io_file_put(). Signed-off-by: Jens Axboe <axboe@kernel.dk> diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index dadd745d389e..15697d88930d 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -998,8 +998,7 @@ static void __io_req_complete_post(struct io_kiocb *req, unsigned issue_flags) io_put_kbuf_comp(req); if (unlikely(req->flags & IO_REQ_CLEAN_FLAGS)) io_clean_op(req); - if (!(req->flags & REQ_F_FIXED_FILE)) - io_put_file(req->file); + io_put_file(req); rsrc_node = req->rsrc_node; /* @@ -1533,8 +1532,7 @@ void io_free_batch_list(struct io_ring_ctx *ctx, struct io_wq_work_node *node) if (unlikely(req->flags & IO_REQ_CLEAN_FLAGS)) io_clean_op(req); } - if (!(req->flags & REQ_F_FIXED_FILE)) - io_put_file(req->file); + io_put_file(req); io_req_put_rsrc_locked(req, ctx); diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index 12769bad5cee..ff153af28236 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -196,10 +196,10 @@ static inline bool req_has_async_data(struct io_kiocb *req) return req->flags & REQ_F_ASYNC_DATA; } -static inline void io_put_file(struct file *file) +static inline void io_put_file(struct io_kiocb *req) { - if (file) - fput(file); + if (!(req->flags & REQ_F_FIXED_FILE) && req->file) + fput(req->file); } static inline void io_ring_submit_unlock(struct io_ring_ctx *ctx,
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 3da26171599b..138635e66d44 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -1004,7 +1004,7 @@ static void __io_req_complete_post(struct io_kiocb *req, unsigned issue_flags) if (unlikely(req->flags & IO_REQ_CLEAN_FLAGS)) io_clean_op(req); if (!(req->flags & REQ_F_FIXED_FILE)) - io_put_file(req->file); + io_put_file(req); rsrc_node = req->rsrc_node; /* @@ -1539,7 +1539,7 @@ void io_free_batch_list(struct io_ring_ctx *ctx, struct io_wq_work_node *node) io_clean_op(req); } if (!(req->flags & REQ_F_FIXED_FILE)) - io_put_file(req->file); + io_put_file(req); io_req_put_rsrc_locked(req, ctx); diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index 12769bad5cee..46643bc9f3c5 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -196,10 +196,10 @@ static inline bool req_has_async_data(struct io_kiocb *req) return req->flags & REQ_F_ASYNC_DATA; } -static inline void io_put_file(struct file *file) +static inline void io_put_file(struct io_kiocb *req) { - if (file) - fput(file); + if (req->file) + fput(req->file); } static inline void io_ring_submit_unlock(struct io_ring_ctx *ctx,
No functional changes in this patch, just a prep patch for needing the request in io_file_put(). Signed-off-by: Jens Axboe <axboe@kernel.dk> --- io_uring/io_uring.c | 4 ++-- io_uring/io_uring.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)