Commit 060495b1 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Factor out decrementing ref. count of nvme_bdev_ns 



Factor out the common operation of nvme_ctrlr_depopulate_namespace_done()
and nvme_bdev_attach_bdev_to_ns() into a helper function nvme_bdev_ns_detach().

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I8efa8bc2c2d455d0fd9e0865ff85fd265d14ee06
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5613


Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 723d9443

module/bdev/nvme/bdev_nvme.c

+1 −10
Original line number Diff line number Diff line
@@ -1312,16 +1312,7 @@ timeout_cb(void *cb_arg, struct spdk_nvme_ctrlr *ctrlr, 
void

nvme_ctrlr_depopulate_namespace_done(struct nvme_bdev_ns *nvme_ns)

{

	pthread_mutex_lock(&g_bdev_nvme_mutex);

	assert(nvme_ns->ref > 0);

	nvme_ns->ref--;

	if (nvme_ns->ref > 0) {

		pthread_mutex_unlock(&g_bdev_nvme_mutex);

		return;

	}

	pthread_mutex_unlock(&g_bdev_nvme_mutex);



	nvme_bdev_ctrlr_destruct(nvme_ns->ctrlr);

	nvme_bdev_ns_detach(nvme_ns);

}



static void

module/bdev/nvme/common.c

+16 −8
Original line number Diff line number Diff line
@@ -184,6 +184,21 @@ nvme_bdev_ctrlr_destruct(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr) 
	nvme_bdev_ctrlr_do_destruct(nvme_bdev_ctrlr);

}



void

nvme_bdev_ns_detach(struct nvme_bdev_ns *nvme_ns)

{

	pthread_mutex_lock(&g_bdev_nvme_mutex);

	assert(nvme_ns->ref > 0);

	nvme_ns->ref--;

	if (nvme_ns->ref > 0) {

		pthread_mutex_unlock(&g_bdev_nvme_mutex);

		return;

	}

	pthread_mutex_unlock(&g_bdev_nvme_mutex);



	nvme_bdev_ctrlr_destruct(nvme_ns->ctrlr);

}



void

nvme_bdev_attach_bdev_to_ns(struct nvme_bdev_ns *nvme_ns, struct nvme_bdev *nvme_disk)

{
@@ -201,14 +216,7 @@ nvme_bdev_detach_bdev_from_ns(struct nvme_bdev *nvme_disk) 


	pthread_mutex_lock(&g_bdev_nvme_mutex);

	TAILQ_REMOVE(&nvme_disk->nvme_ns->bdevs, nvme_disk, tailq);



	assert(nvme_ns->ref > 0);

	nvme_ns->ref--;

	if (nvme_ns->ref > 0) {

		pthread_mutex_unlock(&g_bdev_nvme_mutex);

		return;

	}

	pthread_mutex_unlock(&g_bdev_nvme_mutex);



	nvme_bdev_ctrlr_destruct(nvme_ns->ctrlr);

	nvme_bdev_ns_detach(nvme_ns);

}

module/bdev/nvme/common.h

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ void nvme_bdev_dump_trid_json(const struct spdk_nvme_transport_id *trid, 


void nvme_bdev_ctrlr_destruct(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr);

void nvme_bdev_ctrlr_do_destruct(void *ctx);

void nvme_bdev_ns_detach(struct nvme_bdev_ns *nvme_ns);

void nvme_bdev_attach_bdev_to_ns(struct nvme_bdev_ns *nvme_ns, struct nvme_bdev *nvme_disk);

void nvme_bdev_detach_bdev_from_ns(struct nvme_bdev *nvme_disk);

test/unit/lib/bdev/bdev_ocssd.c/bdev_ocssd_ut.c

+1 −7
Original line number Diff line number Diff line
@@ -197,13 +197,7 @@ nvme_ctrlr_populate_namespace_done(struct nvme_async_probe_ctx *ctx, 
void

nvme_ctrlr_depopulate_namespace_done(struct nvme_bdev_ns *ns)

{

	CU_ASSERT(ns->ref > 0);

	ns->ref--;

	if (ns->ref > 0) {

		return;

	}



	nvme_bdev_ctrlr_destruct(ns->ctrlr);

	nvme_bdev_ns_detach(ns);

}



static struct nvme_bdev_ctrlr *