From 2728b774aa5aaf93c6f24827536b007b9588cce4 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Fri, 3 Apr 2020 23:25:31 +0800 Subject: [PATCH] nvme/opal: merge two revert tper command function into one Also rename it with *build* which is more meaningful. Change-Id: I6e81e1b641ffdd04a7420e93e67448dc430f5168 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1668 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- lib/nvme/nvme_opal.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/lib/nvme/nvme_opal.c b/lib/nvme/nvme_opal.c index fdfc1ffde1..72745845b2 100644 --- a/lib/nvme/nvme_opal.c +++ b/lib/nvme/nvme_opal.c @@ -1818,7 +1818,7 @@ struct spdk_opal_dev * } static int -opal_revert_tper(struct spdk_opal_dev *dev, struct opal_session *sess) +opal_build_revert_tper_cmd(struct spdk_opal_dev *dev, struct opal_session *sess) { int err = 0; @@ -1834,9 +1834,10 @@ opal_revert_tper(struct spdk_opal_dev *dev, struct opal_session *sess) opal_add_token_u8(&err, sess, SPDK_OPAL_ENDLIST); if (err) { SPDK_ERRLOG("Error building REVERT TPER command.\n"); + return -ERANGE; } - return err; + return opal_cmd_finalize(sess, sess->hsn, sess->tsn, true); } static int @@ -2028,15 +2029,10 @@ spdk_opal_cmd_revert_tper(struct spdk_opal_dev *dev, const char *passwd) return ret; } - ret = opal_revert_tper(dev, sess); + ret = opal_build_revert_tper_cmd(dev, sess); if (ret) { opal_end_session(dev, sess, dev->comid); - SPDK_ERRLOG("Error on reverting TPer with error %d\n", ret); - goto end; - } - - ret = opal_cmd_finalize(sess, sess->hsn, sess->tsn, true); - if (ret) { + SPDK_ERRLOG("Build revert tper command with error %d\n", ret); goto end; }