ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme/opal: remove unnecessary NULL checks and a API

Browse Source 
The APIs even don't have a chance to be called if the drive can't
support OPAL feature, so just remove the NULL check, and we will
store level 0 discovery descriptors after initialization, so
spdk_opal_cmd_scan() isn't necessary here, remove it as well.

Change-Id: I24f12f2c352996d9ebe76dc015cd0b7502798359
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1231
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Changpeng Liu 2020-03-11 00:47:57 +08:00 committed by Tomasz Zawadzki
parent 8c1d107487
commit 3502a45db2
3 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/nvme/nvme_manage/nvme_manage.c
View File

@ -981,7 +981,6 @@ opal_scan(struct dev *iter)
if (spdk_opal_supported(iter->opal_dev)) {
printf("\n\nOpal Supported:\n");
display_controller(iter, CONTROLLER_DISPLAY_SIMPLISTIC);
spdk_opal_cmd_scan(iter->opal_dev);
opal_dump_info(spdk_opal_get_d0_features_info(iter->opal_dev));
}
spdk_opal_dev_destruct(iter->opal_dev);

1
include/spdk/opal.h
View File

@ -106,7 +106,6 @@ struct spdk_opal_d0_features_info *spdk_opal_get_d0_features_info(struct spdk_op
bool spdk_opal_supported(struct spdk_opal_dev *dev);
int spdk_opal_cmd_scan(struct spdk_opal_dev *dev);
int spdk_opal_cmd_take_ownership(struct spdk_opal_dev *dev, char *new_passwd);
/**

56
lib/nvme/nvme_opal.c
View File

@ -1770,19 +1770,6 @@ struct spdk_opal_dev *
return dev;
}
int
spdk_opal_cmd_scan(struct spdk_opal_dev *dev)
{
int ret;
ret = opal_check_support(dev);
if (ret) {
SPDK_ERRLOG("check opal support failed: %d\n", ret);
spdk_opal_dev_destruct(dev);
}
return ret;
}
static int
opal_revert_tper(struct spdk_opal_dev *dev)
{
@ -1943,8 +1930,8 @@ spdk_opal_cmd_revert_tper(struct spdk_opal_dev *dev, const char *passwd)
int ret;
struct spdk_opal_key opal_key = {};
if (!dev || dev->supported == false) {
return -ENODEV;
if (dev->supported == false) {
return -ENOTSUP;
}
ret = opal_init_key(&opal_key, passwd, OPAL_LOCKING_RANGE_GLOBAL);
@ -2020,8 +2007,8 @@ spdk_opal_cmd_revert_tper_async(struct spdk_opal_dev *dev, const char *passwd,
int ret;
struct spdk_opal_key opal_key = {};
if (!dev || dev->supported == false) {
return -ENODEV;
if (dev->supported == false) {
return -ENOTSUP;
}
if (cb_fn == NULL) {
@ -2124,8 +2111,8 @@ spdk_opal_cmd_lock_unlock(struct spdk_opal_dev *dev, enum spdk_opal_user user,
struct spdk_opal_locking_session locking_session = {};
int ret;
if (!dev || dev->supported == false) {
return -ENODEV;
if (dev->supported == false) {
return -ENOTSUP;
}
ret = opal_init_key(&locking_session.session.opal_key, passwd, locking_range);
@ -2169,8 +2156,8 @@ spdk_opal_cmd_setup_locking_range(struct spdk_opal_dev *dev, enum spdk_opal_user
struct opal_locking_range_setup_session setup_session = {};
int ret;
if (!dev || dev->supported == false) {
return -ENODEV;
if (dev->supported == false) {
return -ENOTSUP;
}
ret = opal_init_key(&setup_session.session.opal_key, passwd, locking_range_id);
@ -2215,8 +2202,8 @@ spdk_opal_cmd_get_max_ranges(struct spdk_opal_dev *dev, const char *passwd)
struct opal_common_session session = {};
int ret;
if (!dev || dev->supported == false) {
return -ENODEV;
if (dev->supported == false) {
return -ENOTSUP;
}
ret = opal_init_key(&session.opal_key, passwd, OPAL_LOCKING_RANGE_GLOBAL);
@ -2258,8 +2245,8 @@ spdk_opal_cmd_get_locking_range_info(struct spdk_opal_dev *dev, const char *pass
struct opal_common_session session = {};
int ret;
if (!dev || dev->supported == false) {
return -ENODEV;
if (dev->supported == false) {
return -ENOTSUP;
}
ret = opal_init_key(&session.opal_key, passwd, locking_range_id);
@ -2300,15 +2287,14 @@ spdk_opal_cmd_enable_user(struct spdk_opal_dev *dev, enum spdk_opal_user user_id
struct opal_common_session session = {};
int ret;
if (!dev || dev->supported == false) {
return -ENODEV;
if (dev->supported == false) {
return -ENOTSUP;
}
ret = opal_init_key(&session.opal_key, passwd, OPAL_LOCKING_RANGE_GLOBAL);
if (ret != 0) {
return ret;
}
session.who = user_id;
pthread_mutex_lock(&dev->mutex_lock);
@ -2344,15 +2330,14 @@ spdk_opal_cmd_add_user_to_locking_range(struct spdk_opal_dev *dev, enum spdk_opa
struct spdk_opal_locking_session locking_session = {};
int ret;
if (!dev || dev->supported == false) {
return -ENODEV;
if (dev->supported == false) {
return -ENOTSUP;
}
ret = opal_init_key(&locking_session.session.opal_key, passwd, locking_range_id);
if (ret != 0) {
return ret;
}
locking_session.session.who = user_id;
locking_session.l_state = lock_flag;
@ -2389,8 +2374,8 @@ spdk_opal_cmd_set_new_passwd(struct spdk_opal_dev *dev, enum spdk_opal_user user
struct spdk_opal_new_pw_session session;
int ret;
if (!dev || dev->supported == false) {
return -ENODEV;
if (dev->supported == false) {
return -ENOTSUP;
}
ret = opal_init_key(&session.old_session.opal_key, old_passwd, OPAL_LOCKING_RANGE_GLOBAL);
@ -2479,15 +2464,14 @@ spdk_opal_cmd_secure_erase_locking_range(struct spdk_opal_dev *dev, enum spdk_op
struct spdk_opal_key active_key = {};
int ret;
if (!dev || dev->supported == false) {
return -ENODEV;
if (dev->supported == false) {
return -ENOTSUP;
}
ret = opal_init_key(&session.opal_key, password, locking_range_id);
if (ret != 0) {
return ret;
}
session.who = user_id;
pthread_mutex_lock(&dev->mutex_lock);