From: Jeremy Kerr <jk@codeconstruct.com.au>
Date: Wed, 20 Jul 2022 02:22:39 +0000 (+0800)
Subject: nvme: Add wrapper for Sanitize NVM
X-Git-Tag: v2.2~48^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=db5628afcddf9d1cfb92de139f8e0bc51f6ff16a;p=users%2Fsagi%2Fnvme-cli.git

nvme: Add wrapper for Sanitize NVM

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>
---

diff --git a/nvme-wrap.c b/nvme-wrap.c
index 510da610..54e07019 100644
--- a/nvme-wrap.c
+++ b/nvme-wrap.c
@@ -128,6 +128,11 @@ int nvme_cli_format_nvm(struct nvme_dev *dev, struct nvme_format_nvm_args *args)
 	return do_admin_args_op(format_nvm, dev, args);
 }
 
+int nvme_cli_sanitize_nvm(struct nvme_dev *dev, struct nvme_sanitize_nvm_args *args)
+{
+	return do_admin_args_op(sanitize_nvm, dev, args);
+}
+
 /* The MI & direct interfaces don't have an exactly-matching API for
  * ns_mgmt_create, as we don't support a timeout for MI.
  */
diff --git a/nvme-wrap.h b/nvme-wrap.h
index 3b129fe3..e9966e0f 100644
--- a/nvme-wrap.h
+++ b/nvme-wrap.h
@@ -37,6 +37,8 @@ int nvme_cli_ns_detach_ctrls(struct nvme_dev *dev, __u32 nsid,
 			     struct nvme_ctrl_list *ctrlist);
 
 int nvme_cli_format_nvm(struct nvme_dev *dev, struct nvme_format_nvm_args *args);
+int nvme_cli_sanitize_nvm(struct nvme_dev *dev,
+			  struct nvme_sanitize_nvm_args *args);
 
 int nvme_cli_get_features(struct nvme_dev *dev,
 			  struct nvme_get_features_args *args);
diff --git a/nvme.c b/nvme.c
index d9a9a6d1..021f7035 100644
--- a/nvme.c
+++ b/nvme.c
@@ -4489,17 +4489,15 @@ static int sanitize(int argc, char **argv, struct command *cmd, struct plugin *p
 
 	struct nvme_sanitize_nvm_args args = {
 		.args_size	= sizeof(args),
-		.fd		= dev_fd(dev),
 		.sanact		= cfg.sanact,
 		.ause		= cfg.ause,
 		.owpass		= cfg.owpass,
 		.oipbp		= cfg.oipbp,
 		.nodas		= cfg.no_dealloc,
 		.ovrpat		= cfg.ovrpat,
-		.timeout	= NVME_DEFAULT_IOCTL_TIMEOUT,
 		.result		= NULL,
 	};
-	err = nvme_sanitize_nvm(&args);
+	err = nvme_cli_sanitize_nvm(dev, &args);
 	if (err < 0)
 		fprintf(stderr, "sanitize: %s\n", nvme_strerror(errno));
 	else if (err > 0)