Skip to content

Commit ac2d19b

Browse files
Ming Leigregkh
authored andcommitted
ublk: fix UBLK_CMD_DEL_DEV_ASYNC handling
[ Upstream commit 55fbb9a ] In ublk_ctrl_uring_cmd(), ioctl command NR should be used for matching _IOC_NR(cmd_op). Fix it by adding one private macro, and this way is clean. Fixes: 13fe8e6 ("ublk: add UBLK_CMD_DEL_DEV_ASYNC") Signed-off-by: Ming Lei <ming.lei@redhat.com> Link: https://lore.kernel.org/r/20240724143311.2646330-1-ming.lei@redhat.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 697d7ca commit ac2d19b

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/block/ublk_drv.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848

4949
#define UBLK_MINORS (1U << MINORBITS)
5050

51+
/* private ioctl command mirror */
52+
#define UBLK_CMD_DEL_DEV_ASYNC _IOC_NR(UBLK_U_CMD_DEL_DEV_ASYNC)
53+
5154
/* All UBLK_F_* have to be included into UBLK_F_ALL */
5255
#define UBLK_F_ALL (UBLK_F_SUPPORT_ZERO_COPY \
5356
| UBLK_F_URING_CMD_COMP_IN_TASK \
@@ -2904,7 +2907,7 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd,
29042907
case UBLK_CMD_DEL_DEV:
29052908
ret = ublk_ctrl_del_dev(&ub, true);
29062909
break;
2907-
case UBLK_U_CMD_DEL_DEV_ASYNC:
2910+
case UBLK_CMD_DEL_DEV_ASYNC:
29082911
ret = ublk_ctrl_del_dev(&ub, false);
29092912
break;
29102913
case UBLK_CMD_GET_QUEUE_AFFINITY:

0 commit comments

Comments
 (0)