Commit 61d85773 authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

lib/nvmf: remove spdk_ and _spdk prefix from functions. 



I missed a few files in this library the first time.

Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Change-Id: I2ad55355e6348eaa10384a148dd45deb9f68fc2b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2442


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAnil Veerabhadrappa <anil.veerabhadrappa@broadcom.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 75343ec4

lib/nvmf/ctrlr.c

+2 −2
Original line number Diff line number Diff line
@@ -2862,7 +2862,7 @@ spdk_nvmf_request_free(struct spdk_nvmf_request *req) 
	struct spdk_nvmf_qpair *qpair = req->qpair;



	TAILQ_REMOVE(&qpair->outstanding, req, link);

	if (spdk_nvmf_transport_req_free(req)) {

	if (nvmf_transport_req_free(req)) {

		SPDK_ERRLOG("Unable to free transport level request resources.\n");

	}
@@ -2896,7 +2896,7 @@ spdk_nvmf_request_complete(struct spdk_nvmf_request *req) 
		      rsp->cdw0, rsp->status.sct, rsp->status.sc, rsp->cid);



	TAILQ_REMOVE(&qpair->outstanding, req, link);

	if (spdk_nvmf_transport_req_complete(req)) {

	if (nvmf_transport_req_complete(req)) {

		SPDK_ERRLOG("Transport request completion error!\n");

	}

lib/nvmf/ctrlr_discovery.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ nvmf_generate_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn, size 
			entry->subtype = subsystem->subtype;

			snprintf(entry->subnqn, sizeof(entry->subnqn), "%s", subsystem->subnqn);



			spdk_nvmf_transport_listener_discover(listener->transport, listener->trid, entry);

			nvmf_transport_listener_discover(listener->transport, listener->trid, entry);



			numrec++;

		}

lib/nvmf/fc.c

+186 −208

File changed.

Preview size limit exceeded, changes collapsed.

lib/nvmf/fc_ls.c

+42 −42
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ nvmf_fc_ls_new_connection(struct spdk_nvmf_fc_association *assoc, uint16_t qid, 
	/* save target port trid in connection (for subsystem

	 * listener validation in fabric connect command)

	 */

	spdk_nvmf_fc_create_trid(&fc_conn->trid, tgtport->fc_nodename.u.wwn,

	nvmf_fc_create_trid(&fc_conn->trid, tgtport->fc_nodename.u.wwn,

			    tgtport->fc_portname.u.wwn);



	return fc_conn;
@@ -464,7 +464,7 @@ nvmf_fc_handle_xmt_ls_rsp_failure(struct spdk_nvmf_fc_association *assoc, 
	api_data->args.cb_info.cb_func = nvmf_fc_ls_rsp_fail_del_conn_cb;

	api_data->args.cb_info.cb_data = opd;



	spdk_nvmf_fc_poller_api_func(api_data->args.hwqp,

	nvmf_fc_poller_api_func(api_data->args.hwqp,

				SPDK_NVMF_FC_POLLER_API_DEL_CONNECTION,

				&api_data->args);

}
@@ -690,7 +690,7 @@ nvmf_fc_del_all_conns_cb(void *cb_data, enum spdk_nvmf_fc_poller_api_ret ret) 
			assoc->snd_disconn_bufs = NULL;



			SPDK_DEBUGLOG(SPDK_LOG_NVMF_FC_LS, "Send LS disconnect\n");

			if (spdk_nvmf_fc_xmt_srsr_req(&assoc->tgtport->fc_port->ls_queue,

			if (nvmf_fc_xmt_srsr_req(&assoc->tgtport->fc_port->ls_queue,

						 srsr_bufs, nvmf_fs_send_ls_disconnect_cb,

						 (void *)srsr_bufs)) {

				SPDK_ERRLOG("Error sending LS disconnect\n");
@@ -725,7 +725,7 @@ nvmf_fc_kill_io_del_all_conns_cb(void *cb_data, enum spdk_nvmf_fc_poller_api_ret 
/* Disconnect/delete (association) request functions */



static int

nvmf_fc_delete_association(struct spdk_nvmf_fc_nport *tgtport,

_nvmf_fc_delete_association(struct spdk_nvmf_fc_nport *tgtport,

			    uint64_t assoc_id, bool send_abts, bool backend_initiated,

			    spdk_nvmf_fc_del_assoc_cb del_assoc_cb,

			    void *cb_data, bool from_ls_rqst)
@@ -827,7 +827,7 @@ nvmf_fc_delete_association(struct spdk_nvmf_fc_nport *tgtport, 
		opd = opd_head;

		opd_head = opd->next_op_ctx;

		api_data = &opd->u.del_assoc;

		spdk_nvmf_fc_poller_api_func(api_data->args.hwqp,

		nvmf_fc_poller_api_func(api_data->args.hwqp,

					SPDK_NVMF_FC_POLLER_API_DEL_CONNECTION,

					&api_data->args);

	}
@@ -890,7 +890,7 @@ nvmf_fc_ls_disconnect_assoc(struct spdk_nvmf_fc_nport *tgtport, 
	api_data = &opd->u.disconn_assoc;

	api_data->tgtport = tgtport;

	api_data->ls_rqst = ls_rqst;

	ret = nvmf_fc_delete_association(tgtport, assoc_id,

	ret = _nvmf_fc_delete_association(tgtport, assoc_id,

					  false, false,

					  nvmf_fc_ls_disconnect_assoc_cb,

					  api_data, true);
@@ -1287,17 +1287,17 @@ rjt_disc: 
/* external functions       */



void

spdk_nvmf_fc_ls_init(struct spdk_nvmf_fc_port *fc_port)

nvmf_fc_ls_init(struct spdk_nvmf_fc_port *fc_port)

{

}



void

spdk_nvmf_fc_ls_fini(struct spdk_nvmf_fc_port *fc_port)

nvmf_fc_ls_fini(struct spdk_nvmf_fc_port *fc_port)

{

}



void

spdk_nvmf_fc_handle_ls_rqst(struct spdk_nvmf_fc_ls_rqst *ls_rqst)

nvmf_fc_handle_ls_rqst(struct spdk_nvmf_fc_ls_rqst *ls_rqst)

{

	struct spdk_nvmf_fc_ls_rqst_w0 *w0 =

		(struct spdk_nvmf_fc_ls_rqst_w0 *)ls_rqst->rqstbuf.virt;
@@ -1326,12 +1326,12 @@ spdk_nvmf_fc_handle_ls_rqst(struct spdk_nvmf_fc_ls_rqst *ls_rqst) 
}



int

spdk_nvmf_fc_delete_association(struct spdk_nvmf_fc_nport *tgtport,

nvmf_fc_delete_association(struct spdk_nvmf_fc_nport *tgtport,

			   uint64_t assoc_id, bool send_abts, bool backend_initiated,

			   spdk_nvmf_fc_del_assoc_cb del_assoc_cb,

			   void *cb_data)

{

	return nvmf_fc_delete_association(tgtport, assoc_id, send_abts, backend_initiated,

	return _nvmf_fc_delete_association(tgtport, assoc_id, send_abts, backend_initiated,

					   del_assoc_cb, cb_data, false);

}
@@ -1369,7 +1369,7 @@ nvmf_fc_poller_api_add_connection(void *arg) 
		      conn_args->fc_conn->conn_id);



	/* make sure connection is not already in poller's list */

	fc_conn = spdk_nvmf_fc_hwqp_find_fc_conn(conn_args->fc_conn->hwqp,

	fc_conn = nvmf_fc_hwqp_find_fc_conn(conn_args->fc_conn->hwqp,

					    conn_args->fc_conn->conn_id);

	if (fc_conn) {

		SPDK_ERRLOG("duplicate connection found");
@@ -1402,8 +1402,8 @@ nvmf_fc_poller_api_quiesce_queue(void *arg) 
	 * is in progress.

	 */

	TAILQ_FOREACH_SAFE(fc_req, &q_args->hwqp->in_use_reqs, link, tmp) {

		if (spdk_nvmf_fc_req_in_xfer(fc_req) && fc_req->is_aborted == true) {

			spdk_nvmf_fc_poller_api_func(q_args->hwqp, SPDK_NVMF_FC_POLLER_API_REQ_ABORT_COMPLETE,

		if (nvmf_fc_req_in_xfer(fc_req) && fc_req->is_aborted == true) {

			nvmf_fc_poller_api_func(q_args->hwqp, SPDK_NVMF_FC_POLLER_API_REQ_ABORT_COMPLETE,

						(void *)fc_req);

		}

	}
@@ -1480,7 +1480,7 @@ nvmf_fc_poller_api_del_connection(void *arg) 
		      conn_args->fc_conn->conn_id);



	/* find the connection in poller's list */

	fc_conn = spdk_nvmf_fc_hwqp_find_fc_conn(hwqp, conn_args->fc_conn->conn_id);

	fc_conn = nvmf_fc_hwqp_find_fc_conn(hwqp, conn_args->fc_conn->conn_id);

	if (!fc_conn) {

		/* perform callback */

		nvmf_fc_poller_api_perform_cb(&conn_args->cb_info, SPDK_NVMF_FC_POLLER_API_NO_CONN_ID);
@@ -1498,7 +1498,7 @@ nvmf_fc_poller_api_del_connection(void *arg) 
			}



			conn_args->fc_request_cnt += 1;

			spdk_nvmf_fc_request_abort(fc_req, conn_args->send_abts,

			nvmf_fc_request_abort(fc_req, conn_args->send_abts,

					      nvmf_fc_poller_conn_abort_done,

					      conn_args);

		}
@@ -1539,7 +1539,7 @@ nvmf_fc_poller_api_abts_received(void *arg) 
	TAILQ_FOREACH(fc_req, &hwqp->in_use_reqs, link) {

		if ((fc_req->rpi == args->ctx->rpi) &&

		    (fc_req->oxid == args->ctx->oxid)) {

			spdk_nvmf_fc_request_abort(fc_req, false,

			nvmf_fc_request_abort(fc_req, false,

					      nvmf_fc_poller_abts_done, args);

			return;

		}
@@ -1612,7 +1612,7 @@ nvmf_fc_poller_api_remove_hwqp(void *arg) 
}



enum spdk_nvmf_fc_poller_api_ret

spdk_nvmf_fc_poller_api_func(struct spdk_nvmf_fc_hwqp *hwqp, enum spdk_nvmf_fc_poller_api api,

nvmf_fc_poller_api_func(struct spdk_nvmf_fc_hwqp *hwqp, enum spdk_nvmf_fc_poller_api api,

			void *api_args) {

	switch (api)

	{
@@ -1645,7 +1645,7 @@ spdk_nvmf_fc_poller_api_func(struct spdk_nvmf_fc_hwqp *hwqp, enum spdk_nvmf_fc_p 


	case SPDK_NVMF_FC_POLLER_API_REQ_ABORT_COMPLETE:

		spdk_thread_send_msg(hwqp->thread,

				     spdk_nvmf_fc_request_abort_complete, api_args);

				     nvmf_fc_request_abort_complete, api_args);

		break;



	case SPDK_NVMF_FC_POLLER_API_QUEUE_SYNC:

lib/nvmf/nvmf.c

+14 −14
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ nvmf_poll_group_poll(void *ctx) 
	struct spdk_nvmf_transport_poll_group *tgroup;



	TAILQ_FOREACH(tgroup, &group->tgroups, link) {

		rc = spdk_nvmf_transport_poll_group_poll(tgroup);

		rc = nvmf_transport_poll_group_poll(tgroup);

		if (rc < 0) {

			return -1;

		}
@@ -158,7 +158,7 @@ nvmf_tgt_destroy_poll_group(void *io_device, void *ctx_buf) 


	TAILQ_FOREACH_SAFE(tgroup, &group->tgroups, link, tmp) {

		TAILQ_REMOVE(&group->tgroups, tgroup, link);

		spdk_nvmf_transport_poll_group_destroy(tgroup);

		nvmf_transport_poll_group_destroy(tgroup);

	}



	for (sid = 0; sid < group->num_sgroups; sid++) {
@@ -713,7 +713,7 @@ spdk_nvmf_tgt_accept(struct spdk_nvmf_tgt *tgt, new_qpair_fn cb_fn, void *cb_arg 
	struct spdk_nvmf_transport *transport, *tmp;



	TAILQ_FOREACH_SAFE(transport, &tgt->transports, link, tmp) {

		spdk_nvmf_transport_accept(transport, cb_fn, cb_arg);

		nvmf_transport_accept(transport, cb_fn, cb_arg);

	}

}
@@ -756,7 +756,7 @@ spdk_nvmf_poll_group_add(struct spdk_nvmf_poll_group *group, 


	TAILQ_FOREACH(tgroup, &group->tgroups, link) {

		if (tgroup->transport == qpair->transport) {

			rc = spdk_nvmf_transport_poll_group_add(tgroup, qpair);

			rc = nvmf_transport_poll_group_add(tgroup, qpair);

			break;

		}

	}
@@ -783,7 +783,7 @@ _nvmf_transport_qpair_fini(void *ctx) 
{

	struct spdk_nvmf_qpair *qpair = ctx;



	spdk_nvmf_transport_qpair_fini(qpair);

	nvmf_transport_qpair_fini(qpair);

}



static void
@@ -826,7 +826,7 @@ _nvmf_qpair_destroy(void *ctx, int status) 
	/* Find the tgroup and remove the qpair from the tgroup */

	TAILQ_FOREACH(tgroup, &qpair->group->tgroups, link) {

		if (tgroup->transport == qpair->transport) {

			rc = spdk_nvmf_transport_poll_group_remove(tgroup, qpair);

			rc = nvmf_transport_poll_group_remove(tgroup, qpair);

			if (rc && (rc != ENOTSUP)) {

				SPDK_ERRLOG("Cannot remove qpair=%p from transport group=%p\n",

					    qpair, tgroup);
@@ -840,7 +840,7 @@ _nvmf_qpair_destroy(void *ctx, int status) 
		TAILQ_FOREACH_SAFE(req, &sgroup->queued, link, tmp) {

			if (req->qpair == qpair) {

				TAILQ_REMOVE(&sgroup->queued, req, link);

				if (spdk_nvmf_transport_req_free(req)) {

				if (nvmf_transport_req_free(req)) {

					SPDK_ERRLOG("Transport request free error!\n");

				}

			}
@@ -850,7 +850,7 @@ _nvmf_qpair_destroy(void *ctx, int status) 
	TAILQ_REMOVE(&qpair->group->qpairs, qpair, link);



	if (!ctrlr || !ctrlr->thread) {

		spdk_nvmf_transport_qpair_fini(qpair);

		nvmf_transport_qpair_fini(qpair);

		if (qpair_ctx->cb_fn) {

			spdk_thread_send_msg(qpair_ctx->thread, qpair_ctx->cb_fn, qpair_ctx->ctx);

		}
@@ -870,7 +870,7 @@ spdk_nvmf_qpair_disconnect(struct spdk_nvmf_qpair *qpair, nvmf_qpair_disconnect_ 


	/* If we get a qpair in the uninitialized state, we can just destroy it immediately */

	if (qpair->state == SPDK_NVMF_QPAIR_UNINITIALIZED) {

		spdk_nvmf_transport_qpair_fini(qpair);

		nvmf_transport_qpair_fini(qpair);

		if (cb_fn) {

			cb_fn(ctx);

		}
@@ -924,21 +924,21 @@ int 
spdk_nvmf_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair,

			      struct spdk_nvme_transport_id *trid)

{

	return spdk_nvmf_transport_qpair_get_peer_trid(qpair, trid);

	return nvmf_transport_qpair_get_peer_trid(qpair, trid);

}



int

spdk_nvmf_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair,

			       struct spdk_nvme_transport_id *trid)

{

	return spdk_nvmf_transport_qpair_get_local_trid(qpair, trid);

	return nvmf_transport_qpair_get_local_trid(qpair, trid);

}



int

spdk_nvmf_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair,

				struct spdk_nvme_transport_id *trid)

{

	return spdk_nvmf_transport_qpair_get_listen_trid(qpair, trid);

	return nvmf_transport_qpair_get_listen_trid(qpair, trid);

}



int
@@ -954,7 +954,7 @@ nvmf_poll_group_add_transport(struct spdk_nvmf_poll_group *group, 
		}

	}



	tgroup = spdk_nvmf_transport_poll_group_create(transport);

	tgroup = nvmf_transport_poll_group_create(transport);

	if (!tgroup) {

		SPDK_ERRLOG("Unable to create poll group for transport\n");

		return -1;
@@ -1350,7 +1350,7 @@ spdk_nvmf_get_optimal_poll_group(struct spdk_nvmf_qpair *qpair) 
{

	struct spdk_nvmf_transport_poll_group *tgroup;



	tgroup = spdk_nvmf_transport_get_optimal_poll_group(qpair->transport, qpair);

	tgroup = nvmf_transport_get_optimal_poll_group(qpair->transport, qpair);



	if (tgroup == NULL) {

		return NULL;