Commit 345d9a4d authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvme: add spdk_ prefix to nvme_qpair_process_completions() 



This will be exposed in the public API.  This rename is in a separate
commit to ease review.

Change-Id: I1b7fef36f85265db27935ac4d22ceef3c7282502
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent df26ab05

lib/nvme/nvme_ctrlr.c

+8 −8
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int nvme_ctrlr_set_intel_support_log_pages(struct spdk_nvme_ctrlr *ctrlr) 
					 nvme_completion_poll_cb,

					 &status);

	while (status.done == false) {

		nvme_qpair_process_completions(&ctrlr->adminq, 0);

		spdk_nvme_qpair_process_completions(&ctrlr->adminq, 0);

	}

	if (spdk_nvme_cpl_is_error(&status.cpl)) {

		nvme_free(log_page_directory);
@@ -432,7 +432,7 @@ nvme_ctrlr_identify(struct spdk_nvme_ctrlr *ctrlr) 
	}



	while (status.done == false) {

		nvme_qpair_process_completions(&ctrlr->adminq, 0);

		spdk_nvme_qpair_process_completions(&ctrlr->adminq, 0);

	}

	if (spdk_nvme_cpl_is_error(&status.cpl)) {

		nvme_printf(ctrlr, "nvme_identify_controller failed!\n");
@@ -473,7 +473,7 @@ nvme_ctrlr_set_num_qpairs(struct spdk_nvme_ctrlr *ctrlr) 
	}



	while (status.done == false) {

		nvme_qpair_process_completions(&ctrlr->adminq, 0);

		spdk_nvme_qpair_process_completions(&ctrlr->adminq, 0);

	}

	if (spdk_nvme_cpl_is_error(&status.cpl)) {

		nvme_printf(ctrlr, "nvme_set_num_queues failed!\n");
@@ -521,7 +521,7 @@ nvme_ctrlr_create_qpairs(struct spdk_nvme_ctrlr *ctrlr) 
		}



		while (status.done == false) {

			nvme_qpair_process_completions(&ctrlr->adminq, 0);

			spdk_nvme_qpair_process_completions(&ctrlr->adminq, 0);

		}

		if (spdk_nvme_cpl_is_error(&status.cpl)) {

			nvme_printf(ctrlr, "nvme_create_io_cq failed!\n");
@@ -536,7 +536,7 @@ nvme_ctrlr_create_qpairs(struct spdk_nvme_ctrlr *ctrlr) 
		}



		while (status.done == false) {

			nvme_qpair_process_completions(&ctrlr->adminq, 0);

			spdk_nvme_qpair_process_completions(&ctrlr->adminq, 0);

		}

		if (spdk_nvme_cpl_is_error(&status.cpl)) {

			nvme_printf(ctrlr, "nvme_create_io_sq failed!\n");
@@ -694,7 +694,7 @@ nvme_ctrlr_configure_aer(struct spdk_nvme_ctrlr *ctrlr) 
	}



	while (status.done == false) {

		nvme_qpair_process_completions(&ctrlr->adminq, 0);

		spdk_nvme_qpair_process_completions(&ctrlr->adminq, 0);

	}

	if (spdk_nvme_cpl_is_error(&status.cpl)) {

		nvme_printf(ctrlr, "nvme_ctrlr_cmd_set_async_event_config failed!\n");
@@ -959,7 +959,7 @@ int32_t 
spdk_nvme_ctrlr_process_io_completions(struct spdk_nvme_ctrlr *ctrlr, uint32_t max_completions)

{

	nvme_assert(nvme_thread_ioq_index >= 0, ("no ioq_index assigned for thread\n"));

	return nvme_qpair_process_completions(&ctrlr->ioq[nvme_thread_ioq_index], max_completions);

	return spdk_nvme_qpair_process_completions(&ctrlr->ioq[nvme_thread_ioq_index], max_completions);

}



int32_t
@@ -968,7 +968,7 @@ spdk_nvme_ctrlr_process_admin_completions(struct spdk_nvme_ctrlr *ctrlr) 
	int32_t num_completions;



	nvme_mutex_lock(&ctrlr->ctrlr_lock);

	num_completions = nvme_qpair_process_completions(&ctrlr->adminq, 0);

	num_completions = spdk_nvme_qpair_process_completions(&ctrlr->adminq, 0);

	nvme_mutex_unlock(&ctrlr->ctrlr_lock);



	return num_completions;

lib/nvme/nvme_internal.h

+2 −1
Original line number Diff line number Diff line
@@ -485,7 +485,8 @@ int nvme_qpair_construct(struct spdk_nvme_qpair *qpair, uint16_t id, 
void	nvme_qpair_destroy(struct spdk_nvme_qpair *qpair);

void	nvme_qpair_enable(struct spdk_nvme_qpair *qpair);

void	nvme_qpair_disable(struct spdk_nvme_qpair *qpair);

int32_t	nvme_qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_completions);

int32_t	spdk_nvme_qpair_process_completions(struct spdk_nvme_qpair *qpair,

		uint32_t max_completions);

void	nvme_qpair_submit_request(struct spdk_nvme_qpair *qpair,

				  struct nvme_request *req);

void	nvme_qpair_reset(struct spdk_nvme_qpair *qpair);

lib/nvme/nvme_ns.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ nvme_ns_construct(struct spdk_nvme_ns *ns, uint16_t id, 
	}



	while (status.done == false) {

		nvme_qpair_process_completions(&ctrlr->adminq, 0);

		spdk_nvme_qpair_process_completions(&ctrlr->adminq, 0);

	}

	if (spdk_nvme_cpl_is_error(&status.cpl)) {

		nvme_printf(ctrlr, "nvme_identify_namespace failed\n");

lib/nvme/nvme_qpair.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ nvme_qpair_check_enabled(struct spdk_nvme_qpair *qpair) 
 * \sa nvme_cb_fn_t

 */

int32_t

nvme_qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_completions)

spdk_nvme_qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_completions)

{

	struct nvme_tracker	*tr;

	struct spdk_nvme_cpl	*cpl;

test/lib/nvme/unit/nvme_ctrlr_c/nvme_ctrlr_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ nvme_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_request *re 
}



int32_t

nvme_qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_completions)

spdk_nvme_qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_completions)

{

	return 0;

}