Commit 878185cf authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

nvmf: Rename spdk_nvmf_ctrlr_disconnect to spdk_nvmf_qpair_disconnect 



Change-Id: I0c6c410d120bec830ec17105de43ca62bf202b7b
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/415313


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent a5279b64

include/spdk/nvmf.h

+7 −7
Original line number Diff line number Diff line
@@ -189,6 +189,13 @@ int spdk_nvmf_poll_group_add(struct spdk_nvmf_poll_group *group, 
int spdk_nvmf_poll_group_remove(struct spdk_nvmf_poll_group *group,

				struct spdk_nvmf_qpair *qpair);



/**

 * Disconnect an NVMe-oF qpair

 *

 * \param qpair The NVMe-oF qpair to disconnect.

 */

void spdk_nvmf_qpair_disconnect(struct spdk_nvmf_qpair *qpair);



/**

 * Create an NVMe-oF subsystem.

 *
@@ -649,13 +656,6 @@ const char *spdk_nvmf_subsystem_get_nqn(struct spdk_nvmf_subsystem *subsystem); 
 */

enum spdk_nvmf_subtype spdk_nvmf_subsystem_get_type(struct spdk_nvmf_subsystem *subsystem);



/**

 * Disconnect the NVMe-oF controller.

 *

 * \param qpair The NVMe-oF qpair associated with the controller.

 */

void spdk_nvmf_ctrlr_disconnect(struct spdk_nvmf_qpair *qpair);



#ifdef __cplusplus

}

#endif

lib/nvmf/nvmf.c

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ _spdk_nvmf_qpair_deactivate(void *ctx) 
}



void

spdk_nvmf_ctrlr_disconnect(struct spdk_nvmf_qpair *qpair)

spdk_nvmf_qpair_disconnect(struct spdk_nvmf_qpair *qpair)

{

	/* Send a message to the thread that owns this qpair */

	spdk_thread_send_msg(qpair->group->thread, _spdk_nvmf_qpair_deactivate, qpair);

lib/nvmf/rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ nvmf_rdma_disconnect(struct rdma_cm_event *evt) 
	/* ack the disconnect event before rdma_destroy_id */

	rdma_ack_cm_event(evt);



	spdk_nvmf_ctrlr_disconnect(qpair);

	spdk_nvmf_qpair_disconnect(qpair);



	return 0;

}

test/unit/lib/nvmf/request.c/request_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct spdk_nvme_ns *spdk_nvme_ctrlr_get_ns(struct spdk_nvme_ctrlr *ctrlr, uint3 
}



void

spdk_nvmf_ctrlr_disconnect(struct spdk_nvmf_qpair *qpair)

spdk_nvmf_qpair_disconnect(struct spdk_nvmf_qpair *qpair)

{

}