From ebb01092a360b574c4936845ed9ce4ab46048e49 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Fri, 27 Mar 2020 21:27:38 +0800 Subject: [PATCH] nvme/opal: use secure erase API again Commit 8c1d107 added a new erase API and renamed the original API with "secure_" prefix according to the specification, as the secure one will not cryptographically erase user data, due to the limitation from the drive, only the secure API can be supported, so changing the caller to use the original again. Change-Id: I25cb054e728065d9ae9c6c30aa0ab374d60cf6f6 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1519 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- examples/nvme/nvme_manage/nvme_manage.c | 3 ++- module/bdev/nvme/vbdev_opal.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/nvme/nvme_manage/nvme_manage.c b/examples/nvme/nvme_manage/nvme_manage.c index e7c21a4b5..311cf5ad4 100644 --- a/examples/nvme/nvme_manage/nvme_manage.c +++ b/examples/nvme/nvme_manage/nvme_manage.c @@ -1515,7 +1515,8 @@ opal_erase_locking_range(struct dev *iter) return; } printf("\n...\n"); - ret = spdk_opal_cmd_erase_locking_range(iter->opal_dev, OPAL_ADMIN1, locking_range_id, passwd_p); + ret = spdk_opal_cmd_secure_erase_locking_range(iter->opal_dev, OPAL_ADMIN1, locking_range_id, + passwd_p); if (ret) { printf("Erase locking range failure: %d\n", ret); spdk_opal_dev_destruct(iter->opal_dev); diff --git a/module/bdev/nvme/vbdev_opal.c b/module/bdev/nvme/vbdev_opal.c index e48a3749f..3c54f7554 100644 --- a/module/bdev/nvme/vbdev_opal.c +++ b/module/bdev/nvme/vbdev_opal.c @@ -526,8 +526,8 @@ spdk_vbdev_opal_destruct(const char *bdev_name, const char *password) } /* secure erase locking range */ - rc = spdk_opal_cmd_erase_locking_range(nvme_ctrlr->opal_dev, OPAL_ADMIN1, locking_range_id, - password); + rc = spdk_opal_cmd_secure_erase_locking_range(nvme_ctrlr->opal_dev, OPAL_ADMIN1, locking_range_id, + password); if (rc) { SPDK_ERRLOG("opal erase locking range failed\n"); goto err;