diff options
| author | Caleb Sander Mateos <csander@purestorage.com> | 2025-03-01 22:03:16 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-03-04 17:14:09 +0300 |
| commit | 9e12d09cfdaf89db894abdad392bb8dcd6c0f464 (patch) | |
| tree | c594f62174799b703ccc549c02a58db6aa905b67 | |
| parent | 6e83a442fbbb5f136c50feb7d137017610bc0738 (diff) | |
| download | linux-9e12d09cfdaf89db894abdad392bb8dcd6c0f464.tar.xz | |
ublk: don't cast registered buffer index to int
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>
| -rw-r--r-- | drivers/block/ublk_drv.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 512cbd456817..af5a4ff4bd3d 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -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)) { |