Commit 55fbb9a5 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

ublk: fix UBLK_CMD_DEL_DEV_ASYNC handling 



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: 13fe8e68 ("ublk: add UBLK_CMD_DEL_DEV_ASYNC")
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20240724143311.2646330-1-ming.lei@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7e04da2d

drivers/block/ublk_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ 


#define UBLK_MINORS		(1U << MINORBITS)



/* private ioctl command mirror */

#define UBLK_CMD_DEL_DEV_ASYNC	_IOC_NR(UBLK_U_CMD_DEL_DEV_ASYNC)



/* All UBLK_F_* have to be included into UBLK_F_ALL */

#define UBLK_F_ALL (UBLK_F_SUPPORT_ZERO_COPY \

		| UBLK_F_URING_CMD_COMP_IN_TASK \
@@ -2903,7 +2906,7 @@ static int ublk_ctrl_uring_cmd(struct io_uring_cmd *cmd, 
	case UBLK_CMD_DEL_DEV:

		ret = ublk_ctrl_del_dev(&ub, true);

		break;

	case UBLK_U_CMD_DEL_DEV_ASYNC:

	case UBLK_CMD_DEL_DEV_ASYNC:

		ret = ublk_ctrl_del_dev(&ub, false);

		break;

	case UBLK_CMD_GET_QUEUE_AFFINITY: