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

bdev: cleanup passthru vbdev

Browse Source 
A few small changes for readability and one changed examine
error returns to breaks to assure examine_done() is called
in those cases.

Change-Id: If21ecdfa9ce1d6dbeeff4ced4e73425cec5940e1
Signed-off-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/406818
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Paul Luse 2018-04-06 09:58:39 -07:00 committed by Jim Harris
parent d734471b93
commit 8988543dbf
1 changed files with 113 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/bdev/passthru/vbdev_passthru.c
View File

@ -310,7 +310,10 @@ vbdev_passthru_init(void)
int i; int i;
sp = spdk_conf_find_section(NULL, "passthru"); sp = spdk_conf_find_section(NULL, "passthru");
if (sp != NULL) { if (sp == NULL) {
return 0;
}
for (i = 0; ; i++) { for (i = 0; ; i++) {
if (!spdk_conf_section_get_nval(sp, "PT", i)) { if (!spdk_conf_section_get_nval(sp, "PT", i)) {
break; break;
@ -352,7 +355,6 @@ vbdev_passthru_init(void)
TAILQ_FOREACH(name, &g_bdev_names, link) { TAILQ_FOREACH(name, &g_bdev_names, link) {
SPDK_NOTICELOG("conf parse matched: %s\n", name->bdev_name); SPDK_NOTICELOG("conf parse matched: %s\n", name->bdev_name);
} }
}
return 0; return 0;
} }
@ -437,12 +439,15 @@ vbdev_passthru_examine(struct spdk_bdev *bdev)
* there's a match, create the pt_node & bdev accordingly. * there's a match, create the pt_node & bdev accordingly.
*/ */
TAILQ_FOREACH(name, &g_bdev_names, link) { TAILQ_FOREACH(name, &g_bdev_names, link) {
if (strcmp(name->bdev_name, bdev->name) == 0) { if (strcmp(name->bdev_name, bdev->name) != 0) {
continue;
}
SPDK_NOTICELOG("Match on %s\n", bdev->name); SPDK_NOTICELOG("Match on %s\n", bdev->name);
pt_node = calloc(1, sizeof(struct vbdev_passthru)); pt_node = calloc(1, sizeof(struct vbdev_passthru));
if (!pt_node) { if (!pt_node) {
SPDK_ERRLOG("could not allocate pt_node\n"); SPDK_ERRLOG("could not allocate pt_node\n");
return; break;
} }
/* The base bdev that we're attaching to. */ /* The base bdev that we're attaching to. */
@ -451,7 +456,7 @@ vbdev_passthru_examine(struct spdk_bdev *bdev)
if (!pt_node->pt_bdev.name) { if (!pt_node->pt_bdev.name) {
SPDK_ERRLOG("could not allocate pt_bdev name\n"); SPDK_ERRLOG("could not allocate pt_bdev name\n");
free(pt_node); free(pt_node);
return; break;
} }
pt_node->pt_bdev.product_name = "passthru"; pt_node->pt_bdev.product_name = "passthru";
@ -481,7 +486,7 @@ vbdev_passthru_examine(struct spdk_bdev *bdev)
TAILQ_REMOVE(&g_pt_nodes, pt_node, link); TAILQ_REMOVE(&g_pt_nodes, pt_node, link);
free(pt_node->pt_bdev.name); free(pt_node->pt_bdev.name);
free(pt_node); free(pt_node);
return; break;
} }
SPDK_NOTICELOG("bdev opened\n"); SPDK_NOTICELOG("bdev opened\n");
@ -492,7 +497,7 @@ vbdev_passthru_examine(struct spdk_bdev *bdev)
TAILQ_REMOVE(&g_pt_nodes, pt_node, link); TAILQ_REMOVE(&g_pt_nodes, pt_node, link);
free(pt_node->pt_bdev.name); free(pt_node->pt_bdev.name);
free(pt_node); free(pt_node);
return; break;
} }
SPDK_NOTICELOG("bdev claimed\n"); SPDK_NOTICELOG("bdev claimed\n");
@ -503,12 +508,11 @@ vbdev_passthru_examine(struct spdk_bdev *bdev)
TAILQ_REMOVE(&g_pt_nodes, pt_node, link); TAILQ_REMOVE(&g_pt_nodes, pt_node, link);
free(pt_node->pt_bdev.name); free(pt_node->pt_bdev.name);
free(pt_node); free(pt_node);
return; break;
} }
SPDK_NOTICELOG("pt_bdev registered\n"); SPDK_NOTICELOG("pt_bdev registered\n");
SPDK_NOTICELOG("created pt_bdev for: %s\n", name->vbdev_name); SPDK_NOTICELOG("created pt_bdev for: %s\n", name->vbdev_name);
} }
}
spdk_bdev_module_examine_done(&passthru_if); spdk_bdev_module_examine_done(&passthru_if);
} }