nvme: Add support for delete-ns command timeout option

Change to pass the timeout value to libnvme API. Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
linux-nvme · Apr 10, 2024 · 65a1ded · 65a1ded
1 parent d48dd88
commit 65a1ded
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/nvme-wrap.c b/nvme-wrap.c
@@ -120,8 +120,11 @@ int nvme_cli_get_features(struct nvme_dev *dev,
 	return do_admin_args_op(get_features, dev, args);
 }
 
-int nvme_cli_ns_mgmt_delete(struct nvme_dev *dev, __u32 nsid)
+int nvme_cli_ns_mgmt_delete(struct nvme_dev *dev, __u32 nsid, __u32 timeout)
 {
+	if (dev->type == NVME_DEV_DIRECT)
+		return nvme_ns_mgmt_delete_timeout(dev_fd(dev), nsid, timeout);
+
 	return do_admin_op(ns_mgmt_delete, dev, nsid);
 }
 

diff --git a/nvme-wrap.h b/nvme-wrap.h
@@ -31,7 +31,7 @@ int nvme_cli_identify_primary_ctrl(struct nvme_dev *dev, __u32 nsid,
 int nvme_cli_identify_secondary_ctrl_list(struct nvme_dev *dev,
 					  __u16 ctrl_id,
 					  struct nvme_secondary_ctrl_list *sc_list);
-int nvme_cli_ns_mgmt_delete(struct nvme_dev *dev, __u32 nsid);
+int nvme_cli_ns_mgmt_delete(struct nvme_dev *dev, __u32 nsid, __u32 timeout);
 int nvme_cli_ns_mgmt_create(struct nvme_dev *dev,
 			struct nvme_ns_mgmt_host_sw_specified *data,
 			__u32 *nsid, __u32 timeout, __u8 csi);

diff --git a/nvme.c b/nvme.c
@@ -2779,7 +2779,7 @@ static int delete_ns(int argc, char **argv, struct command *cmd, struct plugin *
 		}
 	}
 
-	err = nvme_cli_ns_mgmt_delete(dev, cfg.namespace_id);
+	err = nvme_cli_ns_mgmt_delete(dev, cfg.namespace_id, nvme_cfg.timeout);
 	if (!err)
 		printf("%s: Success, deleted nsid:%d\n", cmd->name, cfg.namespace_id);
 	else if (err > 0)