Skip to contentSkip to conversation

ublk: fix UBLK_CMD_DEL_DEV_ASYNC handling

PATCH Applied Ming Lei 2 participants 2 messages Jul 24, 2024

Subsystems (2)
lore
Share & tools
lore

Ming Lei

author
#0 lore raw

PATCH 1/1 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 13fe8e6825e4 ("ublk: add UBLK_CMD_DEL_DEV_ASYNC")
---
 drivers/block/ublk_drv.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/block/ublk_drv.c +4 -1
index 6fb799ec0d88..890c08792ba8 100644
@@ -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:
Signature · 1 line
2.45.2
maintainer Applied
#1 lore raw
Quoted 6 lines · Ming Lei

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.

Applied, thanks!

[1/1] ublk: fix UBLK_CMD_DEL_DEV_ASYNC handling

      commit: 55fbb9a5d64e0e590cad5eacc16c99f2482a008f

Best regards,

Signature · 1 line
Jens Axboe