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

bdev/nvme: Rename nvme_bdev_ctrlr_destruct() by nvme_bdev_ctrlr_release() 



The reference count of nvme_bdev_ctrlr will be used to update ANA log
page safely, and nvme_bdev_ctrlr_destruct() can be used to decrement
reference count after completing ANA log page update.

However, nvme_bdev_ctrlr_destruct() is not a good name for this case.
Furthermore, nvme_bdev_ctrlr_destruct() does not set the destruct flag
to true, and the next patch will need nvme_bdev_ctrlr_acquire().

Hence rename nvme_bdev_ctrlr_destruct() by nvme_bdev_ctrlr_release().

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


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 0f4cebeb

module/bdev/nvme/bdev_nvme.c

+2 −2
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ bdev_nvme_destruct(void *ctx) 
	if (!nvme_ns->populated) {

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



		nvme_bdev_ctrlr_destruct(nvme_ns->ctrlr);

		nvme_bdev_ctrlr_release(nvme_ns->ctrlr);

	} else {

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

	}
@@ -1961,7 +1961,7 @@ _nvme_bdev_ctrlr_destruct(void *ctx) 
	struct nvme_bdev_ctrlr *nvme_bdev_ctrlr = ctx;



	nvme_ctrlr_depopulate_namespaces(nvme_bdev_ctrlr);

	nvme_bdev_ctrlr_destruct(nvme_bdev_ctrlr);

	nvme_bdev_ctrlr_release(nvme_bdev_ctrlr);

}



static int

module/bdev/nvme/bdev_ocssd.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ bdev_ocssd_destruct(void *ctx) 
	if (!nvme_ns->populated) {

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



		nvme_bdev_ctrlr_destruct(nvme_ns->ctrlr);

		nvme_bdev_ctrlr_release(nvme_ns->ctrlr);

	} else {

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

	}

module/bdev/nvme/common.c

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ nvme_bdev_ctrlr_unregister(void *ctx) 
}



void

nvme_bdev_ctrlr_destruct(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)

nvme_bdev_ctrlr_release(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr)

{

	pthread_mutex_lock(&nvme_bdev_ctrlr->mutex);
@@ -210,5 +210,5 @@ nvme_ctrlr_depopulate_namespace_done(struct nvme_bdev_ns *nvme_ns) 
	}

	pthread_mutex_unlock(&nvme_bdev_ctrlr->mutex);



	nvme_bdev_ctrlr_destruct(nvme_bdev_ctrlr);

	nvme_bdev_ctrlr_release(nvme_bdev_ctrlr);

}

module/bdev/nvme/common.h

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ struct nvme_bdev_ctrlr *nvme_bdev_next_ctrlr(struct nvme_bdev_ctrlr *prev); 
void nvme_bdev_dump_trid_json(const struct spdk_nvme_transport_id *trid,

			      struct spdk_json_write_ctx *w);



void nvme_bdev_ctrlr_destruct(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr);

void nvme_bdev_ctrlr_release(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr);

void nvme_bdev_ctrlr_unregister(void *ctx);

void nvme_bdev_ctrlr_delete(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr);

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

+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ delete_nvme_bdev_controller(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr) 
		bdev_ocssd_depopulate_namespace(nvme_bdev_ctrlr->namespaces[nsid]);

	}



	nvme_bdev_ctrlr_destruct(nvme_bdev_ctrlr);

	nvme_bdev_ctrlr_release(nvme_bdev_ctrlr);

	spdk_delay_us(1000);



	while (spdk_thread_poll(g_thread, 0, 0) > 0) {}