]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ublk: don't cast registered buffer index to int
authorCaleb Sander Mateos <csander@purestorage.com>
Sat, 1 Mar 2025 19:03:16 +0000 (12:03 -0700)
committerJens Axboe <axboe@kernel.dk>
Tue, 4 Mar 2025 14:14:09 +0000 (07:14 -0700)
io_buffer_register_bvec() takes index as an unsigned int argument, but
ublk_register_io_buf() casts ub_cmd->addr (a u64) to int. Remove the
misleading cast and instead pass index as an unsigned value to
ublk_register_io_buf() and ublk_unregister_io_buf().

Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250301190317.950208-1-csander@purestorage.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/ublk_drv.c

index 512cbd456817b097ece48d4ba089e6f0fda1b315..af5a4ff4bd3d9aa064b72afaacb5dbadbb06f4da 100644 (file)
@@ -1762,12 +1762,11 @@ static void ublk_io_release(void *priv)
 
 static int ublk_register_io_buf(struct io_uring_cmd *cmd,
                                struct ublk_queue *ubq, unsigned int tag,
-                               const struct ublksrv_io_cmd *ub_cmd,
-                               unsigned int issue_flags)
+                               unsigned int index, unsigned int issue_flags)
 {
        struct ublk_device *ub = cmd->file->private_data;
-       int index = (int)ub_cmd->addr, ret;
        struct request *req;
+       int ret;
 
        req = __ublk_check_and_get_req(ub, ubq, tag, 0);
        if (!req)
@@ -1784,10 +1783,9 @@ static int ublk_register_io_buf(struct io_uring_cmd *cmd,
 }
 
 static int ublk_unregister_io_buf(struct io_uring_cmd *cmd,
-                                 const struct ublksrv_io_cmd *ub_cmd,
-                                 unsigned int issue_flags)
+                                 unsigned int index, unsigned int issue_flags)
 {
-       return io_buffer_unregister_bvec(cmd, ub_cmd->addr, issue_flags);
+       return io_buffer_unregister_bvec(cmd, index, issue_flags);
 }
 
 static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd,
@@ -1842,9 +1840,9 @@ static int __ublk_ch_uring_cmd(struct io_uring_cmd *cmd,
        ret = -EINVAL;
        switch (_IOC_NR(cmd_op)) {
        case UBLK_IO_REGISTER_IO_BUF:
-               return ublk_register_io_buf(cmd, ubq, tag, ub_cmd, issue_flags);
+               return ublk_register_io_buf(cmd, ubq, tag, ub_cmd->addr, issue_flags);
        case UBLK_IO_UNREGISTER_IO_BUF:
-               return ublk_unregister_io_buf(cmd, ub_cmd, issue_flags);
+               return ublk_unregister_io_buf(cmd, ub_cmd->addr, issue_flags);
        case UBLK_IO_FETCH_REQ:
                /* UBLK_IO_FETCH_REQ is only allowed before queue is setup */
                if (ublk_queue_ready(ubq)) {