Commit d1f88939 authored by Jim Harris's avatar Jim Harris Committed by Tomasz Zawadzki
Browse files

bdev/nvme: reuse nvme_ctrlr_depopulate_namespace 



Let's reuse this function in the remove path, to avoid
some code duplication.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I33519e093dafc71e7ccb6aad40638d33a820a0a5

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/475798


Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 922fc424

module/bdev/nvme/bdev_nvme.c

+1 −5
Original line number Diff line number Diff line
@@ -1210,7 +1210,6 @@ remove_cb(void *cb_ctx, struct spdk_nvme_ctrlr *ctrlr) 
	uint32_t i;

	struct nvme_bdev_ctrlr *nvme_bdev_ctrlr;

	struct nvme_bdev_ns *ns;

	struct nvme_bdev *nvme_bdev, *tmp;



	pthread_mutex_lock(&g_bdev_nvme_mutex);

	TAILQ_FOREACH(nvme_bdev_ctrlr, &g_nvme_bdev_ctrlrs, tailq) {
@@ -1227,10 +1226,7 @@ remove_cb(void *cb_ctx, struct spdk_nvme_ctrlr *ctrlr) 
				ns = nvme_bdev_ctrlr->namespaces[nsid - 1];

				if (ns->populated) {

					assert(ns->id == nsid);

					ns->populated = false;

					TAILQ_FOREACH_SAFE(nvme_bdev, &ns->bdevs, tailq, tmp) {

						spdk_bdev_unregister(&nvme_bdev->disk, NULL, NULL);

					}

					nvme_ctrlr_depopulate_namespace(ns);

				}

			}