]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ublk: remove unused req argument from ublk_sub_req_ref()
authorCaleb Sander Mateos <csander@purestorage.com>
Tue, 15 Jul 2025 15:42:43 +0000 (09:42 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 15 Jul 2025 18:12:45 +0000 (12:12 -0600)
Since commit b749965edda8 ("ublk: remove ublk_commit_and_fetch()"),
ublk_sub_req_ref() no longer uses its struct request *req argument.
So drop the argument from ublk_sub_req_ref(), and from
ublk_need_complete_req(), which only passes it to ublk_sub_req_ref().

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Link: https://lore.kernel.org/r/20250715154244.1626810-1-csander@purestorage.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/ublk_drv.c

index d8b378ad687226e80a0d397cf812026604969a24..57e64c6b5549c9c4f9730f9c8dbaef3cde4874fd 100644 (file)
@@ -714,7 +714,7 @@ static inline void ublk_put_req_ref(struct ublk_io *io, struct request *req)
                __ublk_complete_rq(req);
 }
 
-static inline bool ublk_sub_req_ref(struct ublk_io *io, struct request *req)
+static inline bool ublk_sub_req_ref(struct ublk_io *io)
 {
        unsigned sub_refs = UBLK_REFCOUNT_INIT - io->task_registered_buffers;
 
@@ -2243,11 +2243,10 @@ static int ublk_check_commit_and_fetch(const struct ublk_queue *ubq,
 }
 
 static bool ublk_need_complete_req(const struct ublk_queue *ubq,
-                                  struct ublk_io *io,
-                                  struct request *req)
+                                  struct ublk_io *io)
 {
        if (ublk_need_req_ref(ubq))
-               return ublk_sub_req_ref(io, req);
+               return ublk_sub_req_ref(io);
        return true;
 }
 
@@ -2359,7 +2358,7 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd,
                io->res = ub_cmd->result;
                req = ublk_fill_io_cmd(io, cmd);
                ret = ublk_config_io_buf(ubq, io, cmd, ub_cmd->addr, &buf_idx);
-               compl = ublk_need_complete_req(ubq, io, req);
+               compl = ublk_need_complete_req(ubq, io);
 
                /* can't touch 'ublk_io' any more */
                if (buf_idx != UBLK_INVALID_BUF_IDX)