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

bdev/error: Use spdk_bdev_part_base_construct_ext() to pass bdev_name

Browse Source 
Use spdk_bdev_part_base_construct_ext() to pass bdev_name and
remove the spdk_bdev_get_by_name() call. Remove the created configuration
only if non-zero return code other than -ENODEV is returned.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Ieb5ee5d7e1ccc984df1e84205be18c7b93799bba
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4579
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
This commit is contained in:
Shuhei Matsumoto 2020-10-09 22:42:29 +09:00 committed by Tomasz Zawadzki
parent d719c79309
commit 5bb0d8f204
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
module/bdev/error/vbdev_error.c
View File

@ -255,22 +255,27 @@ vbdev_error_base_bdev_hotremove_cb(void *_part_base)
} }
static int static int
_vbdev_error_create(struct spdk_bdev *base_bdev) _vbdev_error_create(const char *base_bdev_name)
{ {
struct spdk_bdev_part_base *base = NULL; struct spdk_bdev_part_base *base = NULL;
struct error_disk *disk = NULL; struct error_disk *disk = NULL;
struct spdk_bdev *base_bdev;
char *name; char *name;
int rc; int rc;
base = spdk_bdev_part_base_construct(base_bdev, rc = spdk_bdev_part_base_construct_ext(base_bdev_name,
vbdev_error_base_bdev_hotremove_cb, vbdev_error_base_bdev_hotremove_cb,
&error_if, &vbdev_error_fn_table, &g_error_disks, &error_if, &vbdev_error_fn_table, &g_error_disks,
NULL, NULL, sizeof(struct error_channel), NULL, NULL, sizeof(struct error_channel),
NULL, NULL); NULL, NULL, &base);
if (!base) { if (rc != 0) {
SPDK_ERRLOG("could not construct part base for bdev %s\n", spdk_bdev_get_name(base_bdev)); if (rc != -ENODEV) {
return -ENOMEM; SPDK_ERRLOG("could not construct part base for bdev %s\n", base_bdev_name);
} }
return rc;
}
base_bdev = spdk_bdev_part_base_get_bdev(base);
disk = calloc(1, sizeof(*disk)); disk = calloc(1, sizeof(*disk));
if (!disk) { if (!disk) {
@ -279,7 +284,7 @@ _vbdev_error_create(struct spdk_bdev *base_bdev)
return -ENOMEM; return -ENOMEM;
} }
name = spdk_sprintf_alloc("EE_%s", spdk_bdev_get_name(base_bdev)); name = spdk_sprintf_alloc("EE_%s", base_bdev_name);
if (!name) { if (!name) {
SPDK_ERRLOG("name allocation failure\n"); SPDK_ERRLOG("name allocation failure\n");
spdk_bdev_part_base_free(base); spdk_bdev_part_base_free(base);
@ -291,7 +296,7 @@ _vbdev_error_create(struct spdk_bdev *base_bdev)
"Error Injection Disk"); "Error Injection Disk");
free(name); free(name);
if (rc) { if (rc) {
SPDK_ERRLOG("could not construct part for bdev %s\n", spdk_bdev_get_name(base_bdev)); SPDK_ERRLOG("could not construct part for bdev %s\n", base_bdev_name);
/* spdk_bdev_part_construct will free name on failure */ /* spdk_bdev_part_construct will free name on failure */
spdk_bdev_part_base_free(base); spdk_bdev_part_base_free(base);
free(disk); free(disk);
@ -307,7 +312,6 @@ int
vbdev_error_create(const char *base_bdev_name) vbdev_error_create(const char *base_bdev_name)
{ {
int rc; int rc;
struct spdk_bdev *base_bdev;
rc = vbdev_error_config_add(base_bdev_name); rc = vbdev_error_config_add(base_bdev_name);
if (rc != 0) { if (rc != 0) {
@ -316,13 +320,10 @@ vbdev_error_create(const char *base_bdev_name)
return rc; return rc;
} }
base_bdev = spdk_bdev_get_by_name(base_bdev_name); rc = _vbdev_error_create(base_bdev_name);
if (!base_bdev) { if (rc == -ENODEV) {
return 0; rc = 0;
} } else if (rc != 0) {
rc = _vbdev_error_create(base_bdev);
if (rc != 0) {
vbdev_error_config_remove(base_bdev_name); vbdev_error_config_remove(base_bdev_name);
SPDK_ERRLOG("Could not create ErrorInjection bdev %s (rc=%d)\n", SPDK_ERRLOG("Could not create ErrorInjection bdev %s (rc=%d)\n",
base_bdev_name, rc); base_bdev_name, rc);
@ -478,7 +479,7 @@ vbdev_error_examine(struct spdk_bdev *bdev)
cfg = vbdev_error_config_find_by_base_name(bdev->name); cfg = vbdev_error_config_find_by_base_name(bdev->name);
if (cfg != NULL) { if (cfg != NULL) {
rc = _vbdev_error_create(bdev); rc = _vbdev_error_create(bdev->name);
if (rc != 0) { if (rc != 0) {
SPDK_ERRLOG("could not create error vbdev for bdev %s at examine\n", SPDK_ERRLOG("could not create error vbdev for bdev %s at examine\n",
bdev->name); bdev->name);