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 dadd745d389ecc21266a29cbccb4f4036e3d31ca..15697d88930d9f76069cc755bbea01ad26563319 100644 (file)
--- 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 12769bad5cee06a5dfe1d4c44800afe808f36970..ff153af282364db35f620650c37744b35e1a46ea 100644 (file)
--- 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,