Commit 8988543d authored by Paul Luse's avatar Paul Luse Committed by Jim Harris
Browse files

bdev: cleanup passthru vbdev 



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: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/406818


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent d734471b

lib/bdev/passthru/vbdev_passthru.c

+114 −110
Original line number Diff line number Diff line
@@ -310,7 +310,10 @@ vbdev_passthru_init(void) 
	int i;



	sp = spdk_conf_find_section(NULL, "passthru");

	if (sp != NULL) {

	if (sp == NULL) {

		return 0;

	}



	for (i = 0; ; i++) {

		if (!spdk_conf_section_get_nval(sp, "PT", i)) {

			break;
@@ -352,7 +355,6 @@ vbdev_passthru_init(void) 
	TAILQ_FOREACH(name, &g_bdev_names, link) {

		SPDK_NOTICELOG("conf parse matched: %s\n", name->bdev_name);

	}

	}

	return 0;

}
@@ -437,12 +439,15 @@ vbdev_passthru_examine(struct spdk_bdev *bdev) 
	 * there's a match, create the pt_node & bdev accordingly.

	 */

	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);

		pt_node = calloc(1, sizeof(struct vbdev_passthru));

		if (!pt_node) {

			SPDK_ERRLOG("could not allocate pt_node\n");

				return;

			break;

		}



		/* 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) {

			SPDK_ERRLOG("could not allocate pt_bdev name\n");

			free(pt_node);

				return;

			break;

		}

		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);

			free(pt_node->pt_bdev.name);

			free(pt_node);

				return;

			break;

		}

		SPDK_NOTICELOG("bdev opened\n");
@@ -492,7 +497,7 @@ vbdev_passthru_examine(struct spdk_bdev *bdev) 
			TAILQ_REMOVE(&g_pt_nodes, pt_node, link);

			free(pt_node->pt_bdev.name);

			free(pt_node);

				return;

			break;

		}

		SPDK_NOTICELOG("bdev claimed\n");
@@ -503,12 +508,11 @@ vbdev_passthru_examine(struct spdk_bdev *bdev) 
			TAILQ_REMOVE(&g_pt_nodes, pt_node, link);

			free(pt_node->pt_bdev.name);

			free(pt_node);

				return;

			break;

		}

		SPDK_NOTICELOG("pt_bdev registered\n");

		SPDK_NOTICELOG("created pt_bdev for: %s\n", name->vbdev_name);

	}

	}

	spdk_bdev_module_examine_done(&passthru_if);

}