Commit 60826719 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Konrad Sztyber
Browse files

bdev/nvme: Factor out incrementing nvme_ctrlr->ref into a helper function 



The upcoming changes will increment nvme_ctrlr->ref for other cases.
This is a preparation for those.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I4975239073483bf8462160f78d87a162d0a4c836
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24911


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent 8f9f6245

module/bdev/nvme/bdev_nvme.c

+10 −6
Original line number Diff line number Diff line
@@ -771,6 +771,14 @@ nvme_ctrlr_put_ref(struct nvme_ctrlr *nvme_ctrlr) 
	spdk_thread_exec_msg(nvme_ctrlr->thread, nvme_ctrlr_unregister, nvme_ctrlr);

}



static void

nvme_ctrlr_get_ref(struct nvme_ctrlr *nvme_ctrlr)

{

	pthread_mutex_lock(&nvme_ctrlr->mutex);

	nvme_ctrlr->ref++;

	pthread_mutex_unlock(&nvme_ctrlr->mutex);

}



static void

bdev_nvme_clear_current_io_path(struct nvme_bdev_channel *nbdev_ch)

{
@@ -3585,9 +3593,7 @@ nvme_qpair_create(struct nvme_ctrlr *nvme_ctrlr, struct nvme_ctrlr_channel *ctrl 


	ctrlr_ch->qpair = nvme_qpair;



	pthread_mutex_lock(&nvme_qpair->ctrlr->mutex);

	nvme_qpair->ctrlr->ref++;

	pthread_mutex_unlock(&nvme_qpair->ctrlr->mutex);

	nvme_ctrlr_get_ref(nvme_ctrlr);



	return 0;

}
@@ -4811,9 +4817,7 @@ nvme_ctrlr_populate_namespace_done(struct nvme_ns *nvme_ns, int rc) 


	if (rc == 0) {

		nvme_ns->probe_ctx = NULL;

		pthread_mutex_lock(&nvme_ctrlr->mutex);

		nvme_ctrlr->ref++;

		pthread_mutex_unlock(&nvme_ctrlr->mutex);

		nvme_ctrlr_get_ref(nvme_ctrlr);

	} else {

		RB_REMOVE(nvme_ns_tree, &nvme_ctrlr->namespaces, nvme_ns);

		nvme_ns_free(nvme_ns);