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

bdev/nvme: Rename nvme_ctrlr_release() by nvme_ctrlr_put_ref() 



The following patches will factor out incrementing nvme_ctrlr->ref
into a helper function. In SPDK, we find get/put_ref have been used for
similar cases. Follow such pattern.

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


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

module/bdev/nvme/bdev_nvme.c

+7 −7
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ nvme_ctrlr_can_be_unregistered(struct nvme_ctrlr *nvme_ctrlr) 
}



static void

nvme_ctrlr_release(struct nvme_ctrlr *nvme_ctrlr)

nvme_ctrlr_put_ref(struct nvme_ctrlr *nvme_ctrlr)

{

	pthread_mutex_lock(&nvme_ctrlr->mutex);

	SPDK_DTRACE_PROBE2(bdev_nvme_ctrlr_release, nvme_ctrlr->nbdev_ctrlr->name, nvme_ctrlr->ref);
@@ -1907,7 +1907,7 @@ bdev_nvme_destruct(void *ctx) 
		if (nvme_ctrlr_get_ns(nvme_ns->ctrlr, nvme_ns->id) == NULL) {

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



			nvme_ctrlr_release(nvme_ns->ctrlr);

			nvme_ctrlr_put_ref(nvme_ns->ctrlr);

			nvme_ns_free(nvme_ns);

		} else {

			pthread_mutex_unlock(&nvme_ns->ctrlr->mutex);
@@ -3617,7 +3617,7 @@ nvme_qpair_delete(struct nvme_qpair *nvme_qpair) 


	spdk_put_io_channel(spdk_io_channel_from_ctx(nvme_qpair->group));



	nvme_ctrlr_release(nvme_qpair->ctrlr);

	nvme_ctrlr_put_ref(nvme_qpair->ctrlr);



	free(nvme_qpair);

}
@@ -4974,7 +4974,7 @@ nvme_ctrlr_depopulate_namespace_done(struct nvme_ns *nvme_ns) 
	nvme_ns_free(nvme_ns);

	pthread_mutex_unlock(&nvme_ctrlr->mutex);



	nvme_ctrlr_release(nvme_ctrlr);

	nvme_ctrlr_put_ref(nvme_ctrlr);

}



static void
@@ -6009,7 +6009,7 @@ _nvme_ctrlr_destruct(void *ctx) 
	struct nvme_ctrlr *nvme_ctrlr = ctx;



	nvme_ctrlr_depopulate_namespaces(nvme_ctrlr);

	nvme_ctrlr_release(nvme_ctrlr);

	nvme_ctrlr_put_ref(nvme_ctrlr);

}



static int
@@ -9055,7 +9055,7 @@ _bdev_nvme_set_keys_done(void *_ctx) 
	ctx->cb_fn(ctx->cb_ctx, ctx->status);



	if (ctx->nctrlr != NULL) {

		nvme_ctrlr_release(ctx->nctrlr);

		nvme_ctrlr_put_ref(ctx->nctrlr);

	}

	bdev_nvme_free_set_keys_ctx(ctx);

}
@@ -9078,7 +9078,7 @@ bdev_nvme_authenticate_ctrlr_continue(struct bdev_nvme_set_keys_ctx *ctx) 
	next = bdev_nvme_next_ctrlr_unsafe(NULL, ctx->nctrlr);

	pthread_mutex_unlock(&g_bdev_nvme_mutex);



	nvme_ctrlr_release(ctx->nctrlr);

	nvme_ctrlr_put_ref(ctx->nctrlr);

	ctx->nctrlr = next;



	if (next == NULL) {