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

bdev/nvme: Move up _nvme_ctrlr_read_ana_log_page_done() in a file 



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


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarGangCao <gang.cao@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarDong Yi <dongx.yi@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 84162738

module/bdev/nvme/bdev_nvme.c

+20 −20
Original line number Diff line number Diff line
@@ -1130,6 +1130,26 @@ bdev_nvme_admin_passthru_complete(struct nvme_bdev_io *bio, int rc) 
	spdk_bdev_io_complete(bdev_io, io_status);

}



static void

_nvme_ctrlr_read_ana_log_page_done(struct spdk_io_channel_iter *i, int status)

{

	struct nvme_ctrlr *nvme_ctrlr = spdk_io_channel_iter_get_io_device(i);



	pthread_mutex_lock(&nvme_ctrlr->mutex);



	assert(nvme_ctrlr->ana_log_page_updating == true);

	nvme_ctrlr->ana_log_page_updating = false;



	if (!nvme_ctrlr_can_be_unregistered(nvme_ctrlr)) {

		pthread_mutex_unlock(&nvme_ctrlr->mutex);

		return;

	}



	pthread_mutex_unlock(&nvme_ctrlr->mutex);



	nvme_ctrlr_unregister(nvme_ctrlr);

}



static void

_bdev_nvme_clear_io_path_cache(struct nvme_qpair *nvme_qpair)

{
@@ -3503,26 +3523,6 @@ nvme_ctrlr_set_ana_states(const struct spdk_nvme_ana_group_descriptor *desc, 
	return 0;

}



static void

_nvme_ctrlr_read_ana_log_page_done(struct spdk_io_channel_iter *i, int status)

{

	struct nvme_ctrlr *nvme_ctrlr = spdk_io_channel_iter_get_io_device(i);



	pthread_mutex_lock(&nvme_ctrlr->mutex);



	assert(nvme_ctrlr->ana_log_page_updating == true);

	nvme_ctrlr->ana_log_page_updating = false;



	if (!nvme_ctrlr_can_be_unregistered(nvme_ctrlr)) {

		pthread_mutex_unlock(&nvme_ctrlr->mutex);

		return;

	}



	pthread_mutex_unlock(&nvme_ctrlr->mutex);



	nvme_ctrlr_unregister(nvme_ctrlr);

}



static void

bdev_nvme_disable_read_ana_log_page(struct nvme_ctrlr *nvme_ctrlr)

{