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

lvol: move null check from verify_lvol_name

Browse Source 
This makes the implementation of that function better fit the name.
Control of checking whether the lvs is null is passed to the functions
that call verify_lvol_name

Change-Id: Iedaf3e332797af00161b91e526805151778ae679
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/424579
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Seth Howell 2018-09-04 09:44:51 -07:00 committed by Jim Harris
parent 1062181443
commit 49911660c7
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/lvol/lvol.c
View File

@ -1002,11 +1002,6 @@ _spdk_lvs_verify_lvol_name(struct spdk_lvol_store *lvs, const char *name)
{
struct spdk_lvol *tmp;
if (lvs == NULL) {
SPDK_ERRLOG("lvol store does not exist\n");
return -ENODEV;
}
if (name == NULL || strnlen(name, SPDK_LVOL_NAME_MAX) == 0) {
SPDK_INFOLOG(SPDK_LOG_LVOL, "lvol name not provided.\n");
return -EINVAL;
@ -1046,12 +1041,16 @@ spdk_lvol_create(struct spdk_lvol_store *lvs, const char *name, uint64_t sz,
char *xattr_names[] = {LVOL_NAME, "uuid"};
int rc;
if (lvs == NULL) {
SPDK_ERRLOG("lvol store does not exist\n");
return -EINVAL;
}
rc = _spdk_lvs_verify_lvol_name(lvs, name);
if (rc < 0) {
return rc;
}
assert(lvs != NULL);
bs = lvs->blobstore;
req = calloc(1, sizeof(*req));
@ -1110,6 +1109,12 @@ spdk_lvol_create_snapshot(struct spdk_lvol *origlvol, const char *snapshot_name,
origblob = origlvol->blob;
lvs = origlvol->lvol_store;
if (lvs == NULL) {
SPDK_ERRLOG("lvol store does not exist\n");
cb_fn(cb_arg, NULL, -EINVAL);
return;
}
rc = _spdk_lvs_verify_lvol_name(lvs, snapshot_name);
if (rc < 0) {
cb_fn(cb_arg, NULL, rc);
@ -1168,6 +1173,12 @@ spdk_lvol_create_clone(struct spdk_lvol *origlvol, const char *clone_name,
origblob = origlvol->blob;
lvs = origlvol->lvol_store;
if (lvs == NULL) {
SPDK_ERRLOG("lvol store does not exist\n");
cb_fn(cb_arg, NULL, -EINVAL);
return;
}
rc = _spdk_lvs_verify_lvol_name(lvs, clone_name);
if (rc < 0) {
cb_fn(cb_arg, NULL, rc);