lib/nvmf: remove spdk_ and _spdk prefix from functions.
I missed a few files in this library the first time. Signed-off-by: Seth Howell <seth.howell@intel.com> Change-Id: I2ad55355e6348eaa10384a148dd45deb9f68fc2b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2442 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Anil Veerabhadrappa <anil.veerabhadrappa@broadcom.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Seth Howell
Tomasz Zawadzki
parent
75343ec40a
commit
61d85773f6
@ -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");
|
||||
}
|
||||
|
||||
|
||||
@ -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++;
|
||||
}
|
||||
|
||||
394
lib/nvmf/fc.c
394
lib/nvmf/fc.c
File diff suppressed because it is too large
Load Diff
@ -355,8 +355,8 @@ 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,
|
||||
tgtport->fc_portname.u.wwn);
|
||||
nvmf_fc_create_trid(&fc_conn->trid, tgtport->fc_nodename.u.wwn,
|
||||
tgtport->fc_portname.u.wwn);
|
||||
|
||||
return fc_conn;
|
||||
}
|
||||
@ -464,9 +464,9 @@ 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,
|
||||
SPDK_NVMF_FC_POLLER_API_DEL_CONNECTION,
|
||||
&api_data->args);
|
||||
nvmf_fc_poller_api_func(api_data->args.hwqp,
|
||||
SPDK_NVMF_FC_POLLER_API_DEL_CONNECTION,
|
||||
&api_data->args);
|
||||
}
|
||||
|
||||
/* callback from poller's ADD_Connection event */
|
||||
@ -690,9 +690,9 @@ 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,
|
||||
srsr_bufs, nvmf_fs_send_ls_disconnect_cb,
|
||||
(void *)srsr_bufs)) {
|
||||
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");
|
||||
assoc->snd_disconn_bufs = srsr_bufs;
|
||||
}
|
||||
@ -725,10 +725,10 @@ 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,
|
||||
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)
|
||||
_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)
|
||||
{
|
||||
|
||||
struct nvmf_fc_ls_op_ctx *opd, *opd_tail, *opd_head = NULL;
|
||||
@ -827,9 +827,9 @@ 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,
|
||||
SPDK_NVMF_FC_POLLER_API_DEL_CONNECTION,
|
||||
&api_data->args);
|
||||
nvmf_fc_poller_api_func(api_data->args.hwqp,
|
||||
SPDK_NVMF_FC_POLLER_API_DEL_CONNECTION,
|
||||
&api_data->args);
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -890,10 +890,10 @@ 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,
|
||||
false, false,
|
||||
nvmf_fc_ls_disconnect_assoc_cb,
|
||||
api_data, true);
|
||||
ret = _nvmf_fc_delete_association(tgtport, assoc_id,
|
||||
false, false,
|
||||
nvmf_fc_ls_disconnect_assoc_cb,
|
||||
api_data, true);
|
||||
if (!ret) {
|
||||
return;
|
||||
}
|
||||
@ -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,13 +1326,13 @@ 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,
|
||||
uint64_t assoc_id, bool send_abts, bool backend_initiated,
|
||||
spdk_nvmf_fc_del_assoc_cb del_assoc_cb,
|
||||
void *cb_data)
|
||||
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,
|
||||
del_assoc_cb, cb_data, false);
|
||||
return _nvmf_fc_delete_association(tgtport, assoc_id, send_abts, backend_initiated,
|
||||
del_assoc_cb, cb_data, false);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -1369,8 +1369,8 @@ 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,
|
||||
conn_args->fc_conn->conn_id);
|
||||
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");
|
||||
ret = SPDK_NVMF_FC_POLLER_API_DUP_CONN_ID;
|
||||
@ -1402,9 +1402,9 @@ 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,
|
||||
(void *)fc_req);
|
||||
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,9 +1498,9 @@ 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_poller_conn_abort_done,
|
||||
conn_args);
|
||||
nvmf_fc_request_abort(fc_req, conn_args->send_abts,
|
||||
nvmf_fc_poller_conn_abort_done,
|
||||
conn_args);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1539,8 +1539,8 @@ 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_poller_abts_done, args);
|
||||
nvmf_fc_request_abort(fc_req, false,
|
||||
nvmf_fc_poller_abts_done, args);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -1612,8 +1612,8 @@ 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,
|
||||
void *api_args) {
|
||||
nvmf_fc_poller_api_func(struct spdk_nvmf_fc_hwqp *hwqp, enum spdk_nvmf_fc_poller_api api,
|
||||
void *api_args) {
|
||||
switch (api)
|
||||
{
|
||||
case SPDK_NVMF_FC_POLLER_API_ADD_CONNECTION:
|
||||
@ -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:
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -750,9 +750,9 @@ typedef void (*spdk_nvmf_fc_callback)(uint8_t port_handle,
|
||||
* \return 0 on success, non-zero on failure.
|
||||
*/
|
||||
int
|
||||
spdk_nvmf_fc_master_enqueue_event(enum spdk_fc_event event_type,
|
||||
void *args,
|
||||
spdk_nvmf_fc_callback cb_func);
|
||||
nvmf_fc_master_enqueue_event(enum spdk_fc_event event_type,
|
||||
void *args,
|
||||
spdk_nvmf_fc_callback cb_func);
|
||||
|
||||
/*
|
||||
* dump info
|
||||
@ -764,7 +764,7 @@ struct spdk_nvmf_fc_queue_dump_info {
|
||||
#define SPDK_FC_HW_DUMP_BUF_SIZE (10 * 4096)
|
||||
|
||||
static inline void
|
||||
spdk_nvmf_fc_dump_buf_print(struct spdk_nvmf_fc_queue_dump_info *dump_info, char *fmt, ...)
|
||||
nvmf_fc_dump_buf_print(struct spdk_nvmf_fc_queue_dump_info *dump_info, char *fmt, ...)
|
||||
{
|
||||
uint64_t buffer_size = SPDK_FC_HW_DUMP_BUF_SIZE;
|
||||
int32_t avail = (int32_t)(buffer_size - dump_info->offset);
|
||||
@ -812,14 +812,14 @@ struct spdk_nvmf_fc_xchg_info {
|
||||
*/
|
||||
|
||||
static inline struct spdk_nvmf_fc_request *
|
||||
spdk_nvmf_fc_get_fc_req(struct spdk_nvmf_request *req)
|
||||
nvmf_fc_get_fc_req(struct spdk_nvmf_request *req)
|
||||
{
|
||||
return (struct spdk_nvmf_fc_request *)
|
||||
((uintptr_t)req - offsetof(struct spdk_nvmf_fc_request, req));
|
||||
}
|
||||
|
||||
static inline bool
|
||||
spdk_nvmf_fc_is_port_dead(struct spdk_nvmf_fc_hwqp *hwqp)
|
||||
nvmf_fc_is_port_dead(struct spdk_nvmf_fc_hwqp *hwqp)
|
||||
{
|
||||
switch (hwqp->fc_port->hw_port_status) {
|
||||
case SPDK_FC_PORT_QUIESCED:
|
||||
@ -830,7 +830,7 @@ spdk_nvmf_fc_is_port_dead(struct spdk_nvmf_fc_hwqp *hwqp)
|
||||
}
|
||||
|
||||
static inline bool
|
||||
spdk_nvmf_fc_req_in_xfer(struct spdk_nvmf_fc_request *fc_req)
|
||||
nvmf_fc_req_in_xfer(struct spdk_nvmf_fc_request *fc_req)
|
||||
{
|
||||
switch (fc_req->state) {
|
||||
case SPDK_NVMF_FC_REQ_READ_XFER:
|
||||
@ -845,7 +845,7 @@ spdk_nvmf_fc_req_in_xfer(struct spdk_nvmf_fc_request *fc_req)
|
||||
}
|
||||
|
||||
static inline void
|
||||
spdk_nvmf_fc_create_trid(struct spdk_nvme_transport_id *trid, uint64_t n_wwn, uint64_t p_wwn)
|
||||
nvmf_fc_create_trid(struct spdk_nvme_transport_id *trid, uint64_t n_wwn, uint64_t p_wwn)
|
||||
{
|
||||
spdk_nvme_trid_populate_transport(trid, SPDK_NVME_TRANSPORT_FC);
|
||||
trid->adrfam = SPDK_NVMF_ADRFAM_FC;
|
||||
@ -853,116 +853,106 @@ spdk_nvmf_fc_create_trid(struct spdk_nvme_transport_id *trid, uint64_t n_wwn, ui
|
||||
snprintf(trid->traddr, sizeof(trid->traddr), "nn-0x%lx:pn-0x%lx", n_wwn, p_wwn);
|
||||
}
|
||||
|
||||
void spdk_nvmf_fc_ls_init(struct spdk_nvmf_fc_port *fc_port);
|
||||
void nvmf_fc_ls_init(struct spdk_nvmf_fc_port *fc_port);
|
||||
|
||||
void spdk_nvmf_fc_ls_fini(struct spdk_nvmf_fc_port *fc_port);
|
||||
void 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);
|
||||
void nvmf_fc_handle_ls_rqst(struct spdk_nvmf_fc_ls_rqst *ls_rqst);
|
||||
void nvmf_fc_ls_add_conn_failure(
|
||||
struct spdk_nvmf_fc_association *assoc,
|
||||
struct spdk_nvmf_fc_ls_rqst *ls_rqst,
|
||||
struct spdk_nvmf_fc_conn *fc_conn,
|
||||
bool aq_conn);
|
||||
|
||||
int spdk_nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *tgtport,
|
||||
struct spdk_nvmf_fc_ls_rqst *ls_rqst);
|
||||
void nvmf_fc_init_hwqp(struct spdk_nvmf_fc_port *fc_port, struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
|
||||
void spdk_nvmf_fc_init_hwqp(struct spdk_nvmf_fc_port *fc_port, struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
void nvmf_fc_init_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
|
||||
void spdk_nvmf_fc_init_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
|
||||
struct spdk_nvmf_fc_conn *spdk_nvmf_fc_hwqp_find_fc_conn(struct spdk_nvmf_fc_hwqp *hwqp,
|
||||
struct spdk_nvmf_fc_conn *nvmf_fc_hwqp_find_fc_conn(struct spdk_nvmf_fc_hwqp *hwqp,
|
||||
uint64_t conn_id);
|
||||
|
||||
void spdk_nvmf_fc_hwqp_reinit_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp, void *queues_curr);
|
||||
void nvmf_fc_hwqp_reinit_poller_queues(struct spdk_nvmf_fc_hwqp *hwqp, void *queues_curr);
|
||||
|
||||
struct spdk_nvmf_fc_port *spdk_nvmf_fc_port_lookup(uint8_t port_hdl);
|
||||
struct spdk_nvmf_fc_port *nvmf_fc_port_lookup(uint8_t port_hdl);
|
||||
|
||||
bool spdk_nvmf_fc_port_is_offline(struct spdk_nvmf_fc_port *fc_port);
|
||||
bool nvmf_fc_port_is_offline(struct spdk_nvmf_fc_port *fc_port);
|
||||
|
||||
int spdk_nvmf_fc_port_set_offline(struct spdk_nvmf_fc_port *fc_port);
|
||||
int nvmf_fc_port_set_offline(struct spdk_nvmf_fc_port *fc_port);
|
||||
|
||||
bool spdk_nvmf_fc_port_is_online(struct spdk_nvmf_fc_port *fc_port);
|
||||
bool nvmf_fc_port_is_online(struct spdk_nvmf_fc_port *fc_port);
|
||||
|
||||
int spdk_nvmf_fc_port_set_online(struct spdk_nvmf_fc_port *fc_port);
|
||||
int nvmf_fc_port_set_online(struct spdk_nvmf_fc_port *fc_port);
|
||||
|
||||
int spdk_nvmf_fc_rport_set_state(struct spdk_nvmf_fc_remote_port_info *rport,
|
||||
enum spdk_nvmf_fc_object_state state);
|
||||
int nvmf_fc_rport_set_state(struct spdk_nvmf_fc_remote_port_info *rport,
|
||||
enum spdk_nvmf_fc_object_state state);
|
||||
|
||||
void spdk_nvmf_fc_port_add(struct spdk_nvmf_fc_port *fc_port);
|
||||
void nvmf_fc_port_add(struct spdk_nvmf_fc_port *fc_port);
|
||||
|
||||
int spdk_nvmf_fc_port_add_nport(struct spdk_nvmf_fc_port *fc_port,
|
||||
struct spdk_nvmf_fc_nport *nport);
|
||||
int nvmf_fc_port_add_nport(struct spdk_nvmf_fc_port *fc_port,
|
||||
struct spdk_nvmf_fc_nport *nport);
|
||||
|
||||
int spdk_nvmf_fc_port_remove_nport(struct spdk_nvmf_fc_port *fc_port,
|
||||
struct spdk_nvmf_fc_nport *nport);
|
||||
int nvmf_fc_port_remove_nport(struct spdk_nvmf_fc_port *fc_port,
|
||||
struct spdk_nvmf_fc_nport *nport);
|
||||
|
||||
struct spdk_nvmf_fc_nport *spdk_nvmf_fc_nport_find(uint8_t port_hdl, uint16_t nport_hdl);
|
||||
struct spdk_nvmf_fc_nport *nvmf_fc_nport_find(uint8_t port_hdl, uint16_t nport_hdl);
|
||||
|
||||
int spdk_nvmf_fc_nport_set_state(struct spdk_nvmf_fc_nport *nport,
|
||||
enum spdk_nvmf_fc_object_state state);
|
||||
int nvmf_fc_nport_set_state(struct spdk_nvmf_fc_nport *nport,
|
||||
enum spdk_nvmf_fc_object_state state);
|
||||
|
||||
bool spdk_nvmf_fc_nport_add_rem_port(struct spdk_nvmf_fc_nport *nport,
|
||||
struct spdk_nvmf_fc_remote_port_info *rem_port);
|
||||
bool nvmf_fc_nport_add_rem_port(struct spdk_nvmf_fc_nport *nport,
|
||||
struct spdk_nvmf_fc_remote_port_info *rem_port);
|
||||
|
||||
bool spdk_nvmf_fc_nport_remove_rem_port(struct spdk_nvmf_fc_nport *nport,
|
||||
struct spdk_nvmf_fc_remote_port_info *rem_port);
|
||||
bool nvmf_fc_nport_remove_rem_port(struct spdk_nvmf_fc_nport *nport,
|
||||
struct spdk_nvmf_fc_remote_port_info *rem_port);
|
||||
|
||||
bool spdk_nvmf_fc_nport_has_no_rport(struct spdk_nvmf_fc_nport *nport);
|
||||
bool nvmf_fc_nport_has_no_rport(struct spdk_nvmf_fc_nport *nport);
|
||||
|
||||
int spdk_nvmf_fc_assoc_set_state(struct spdk_nvmf_fc_association *assoc,
|
||||
enum spdk_nvmf_fc_object_state state);
|
||||
int nvmf_fc_assoc_set_state(struct spdk_nvmf_fc_association *assoc,
|
||||
enum spdk_nvmf_fc_object_state state);
|
||||
|
||||
int spdk_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);
|
||||
int 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 spdk_nvmf_ctrlr_is_on_nport(uint8_t port_hdl, uint16_t nport_hdl,
|
||||
struct spdk_nvmf_ctrlr *ctrlr);
|
||||
bool nvmf_ctrlr_is_on_nport(uint8_t port_hdl, uint16_t nport_hdl,
|
||||
struct spdk_nvmf_ctrlr *ctrlr);
|
||||
|
||||
void spdk_nvmf_fc_assign_queue_to_master_thread(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
void nvmf_fc_assign_queue_to_master_thread(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
|
||||
void spdk_nvmf_fc_poll_group_add_hwqp(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
void nvmf_fc_poll_group_add_hwqp(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
|
||||
void spdk_nvmf_fc_poll_group_remove_hwqp(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
void nvmf_fc_poll_group_remove_hwqp(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
|
||||
int spdk_nvmf_fc_hwqp_set_online(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
int nvmf_fc_hwqp_set_online(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
|
||||
int spdk_nvmf_fc_hwqp_set_offline(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
int nvmf_fc_hwqp_set_offline(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
|
||||
uint32_t spdk_nvmf_fc_get_prli_service_params(void);
|
||||
uint32_t nvmf_fc_get_prli_service_params(void);
|
||||
|
||||
void spdk_nvmf_fc_handle_abts_frame(struct spdk_nvmf_fc_nport *nport, uint16_t rpi, uint16_t oxid,
|
||||
uint16_t rxid);
|
||||
void nvmf_fc_handle_abts_frame(struct spdk_nvmf_fc_nport *nport, uint16_t rpi, uint16_t oxid,
|
||||
uint16_t rxid);
|
||||
|
||||
void spdk_nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts,
|
||||
spdk_nvmf_fc_caller_cb cb, void *cb_args);
|
||||
void nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts,
|
||||
spdk_nvmf_fc_caller_cb cb, void *cb_args);
|
||||
|
||||
int spdk_nvmf_fc_xmt_srsr_req(struct spdk_nvmf_fc_hwqp *hwqp,
|
||||
struct spdk_nvmf_fc_srsr_bufs *srsr_bufs,
|
||||
spdk_nvmf_fc_caller_cb cb, void *cb_args);
|
||||
struct spdk_nvmf_tgt *nvmf_fc_get_tgt(void);
|
||||
|
||||
struct spdk_nvmf_tgt *spdk_nvmf_fc_get_tgt(void);
|
||||
|
||||
void spdk_nvmf_fc_dump_all_queues(struct spdk_nvmf_fc_port *fc_port,
|
||||
struct spdk_nvmf_fc_queue_dump_info *dump_info);
|
||||
|
||||
struct spdk_thread *spdk_nvmf_fc_get_master_thread(void);
|
||||
struct spdk_thread *nvmf_fc_get_master_thread(void);
|
||||
|
||||
/*
|
||||
* These functions are called by low level FC driver
|
||||
*/
|
||||
|
||||
static inline struct spdk_nvmf_fc_conn *
|
||||
spdk_nvmf_fc_get_conn(struct spdk_nvmf_qpair *qpair)
|
||||
nvmf_fc_get_conn(struct spdk_nvmf_qpair *qpair)
|
||||
{
|
||||
return (struct spdk_nvmf_fc_conn *)
|
||||
((uintptr_t)qpair - offsetof(struct spdk_nvmf_fc_conn, qpair));
|
||||
}
|
||||
|
||||
static inline uint16_t
|
||||
spdk_nvmf_fc_advance_conn_sqhead(struct spdk_nvmf_qpair *qpair)
|
||||
nvmf_fc_advance_conn_sqhead(struct spdk_nvmf_qpair *qpair)
|
||||
{
|
||||
/* advance sq_head pointer - wrap if needed */
|
||||
qpair->sq_head = (qpair->sq_head == qpair->sq_head_max) ?
|
||||
@ -971,7 +961,7 @@ spdk_nvmf_fc_advance_conn_sqhead(struct spdk_nvmf_qpair *qpair)
|
||||
}
|
||||
|
||||
static inline bool
|
||||
spdk_nvmf_fc_use_send_frame(struct spdk_nvmf_request *req)
|
||||
nvmf_fc_use_send_frame(struct spdk_nvmf_request *req)
|
||||
{
|
||||
/* For now use for only keepalives. */
|
||||
if (req->qpair->qid == 0 &&
|
||||
@ -981,31 +971,31 @@ spdk_nvmf_fc_use_send_frame(struct spdk_nvmf_request *req)
|
||||
return false;
|
||||
}
|
||||
|
||||
enum spdk_nvmf_fc_poller_api_ret spdk_nvmf_fc_poller_api_func(
|
||||
enum spdk_nvmf_fc_poller_api_ret nvmf_fc_poller_api_func(
|
||||
struct spdk_nvmf_fc_hwqp *hwqp,
|
||||
enum spdk_nvmf_fc_poller_api api,
|
||||
void *api_args);
|
||||
|
||||
int spdk_nvmf_fc_hwqp_process_frame(struct spdk_nvmf_fc_hwqp *hwqp, uint32_t buff_idx,
|
||||
struct spdk_nvmf_fc_frame_hdr *frame,
|
||||
struct spdk_nvmf_fc_buffer_desc *buffer, uint32_t plen);
|
||||
int nvmf_fc_hwqp_process_frame(struct spdk_nvmf_fc_hwqp *hwqp, uint32_t buff_idx,
|
||||
struct spdk_nvmf_fc_frame_hdr *frame,
|
||||
struct spdk_nvmf_fc_buffer_desc *buffer, uint32_t plen);
|
||||
|
||||
void spdk_nvmf_fc_hwqp_process_pending_reqs(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
void nvmf_fc_hwqp_process_pending_reqs(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
|
||||
void spdk_nvmf_fc_hwqp_process_pending_ls_rqsts(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
void nvmf_fc_hwqp_process_pending_ls_rqsts(struct spdk_nvmf_fc_hwqp *hwqp);
|
||||
|
||||
void spdk_nvmf_fc_request_set_state(struct spdk_nvmf_fc_request *fc_req,
|
||||
enum spdk_nvmf_fc_request_state state);
|
||||
void nvmf_fc_request_set_state(struct spdk_nvmf_fc_request *fc_req,
|
||||
enum spdk_nvmf_fc_request_state state);
|
||||
|
||||
char *spdk_nvmf_fc_request_get_state_str(int state);
|
||||
char *nvmf_fc_request_get_state_str(int state);
|
||||
|
||||
void spdk_nvmf_fc_request_free(struct spdk_nvmf_fc_request *fc_req);
|
||||
void _nvmf_fc_request_free(struct spdk_nvmf_fc_request *fc_req);
|
||||
|
||||
void spdk_nvmf_fc_request_abort_complete(void *arg1);
|
||||
void nvmf_fc_request_abort_complete(void *arg1);
|
||||
|
||||
bool spdk_nvmf_fc_send_ersp_required(struct spdk_nvmf_fc_request *fc_req,
|
||||
uint32_t rsp_cnt, uint32_t xfer_len);
|
||||
bool nvmf_fc_send_ersp_required(struct spdk_nvmf_fc_request *fc_req,
|
||||
uint32_t rsp_cnt, uint32_t xfer_len);
|
||||
|
||||
int spdk_nvmf_fc_handle_rsp(struct spdk_nvmf_fc_request *req);
|
||||
int nvmf_fc_handle_rsp(struct spdk_nvmf_fc_request *req);
|
||||
|
||||
#endif
|
||||
|
||||
@ -277,7 +277,6 @@ void nvmf_get_discovery_log_page(struct spdk_nvmf_tgt *tgt, const char *hostnqn,
|
||||
|
||||
void nvmf_ctrlr_destruct(struct spdk_nvmf_ctrlr *ctrlr);
|
||||
int nvmf_ctrlr_process_fabrics_cmd(struct spdk_nvmf_request *req);
|
||||
int spdk_nvmf_ctrlr_connect(struct spdk_nvmf_request *req);
|
||||
int nvmf_ctrlr_process_admin_cmd(struct spdk_nvmf_request *req);
|
||||
int nvmf_ctrlr_process_io_cmd(struct spdk_nvmf_request *req);
|
||||
bool nvmf_ctrlr_dsm_supported(struct spdk_nvmf_ctrlr *ctrlr);
|
||||
|
||||
@ -305,7 +305,7 @@ spdk_nvmf_subsystem_create(struct spdk_nvmf_tgt *tgt,
|
||||
}
|
||||
|
||||
static void
|
||||
_spdk_nvmf_subsystem_remove_host(struct spdk_nvmf_subsystem *subsystem, struct spdk_nvmf_host *host)
|
||||
nvmf_subsystem_remove_host(struct spdk_nvmf_subsystem *subsystem, struct spdk_nvmf_host *host)
|
||||
{
|
||||
TAILQ_REMOVE(&subsystem->hosts, host, link);
|
||||
free(host);
|
||||
@ -347,7 +347,7 @@ spdk_nvmf_subsystem_destroy(struct spdk_nvmf_subsystem *subsystem)
|
||||
nvmf_subsystem_remove_all_listeners(subsystem, false);
|
||||
|
||||
TAILQ_FOREACH_SAFE(host, &subsystem->hosts, link, host_tmp) {
|
||||
_spdk_nvmf_subsystem_remove_host(subsystem, host);
|
||||
nvmf_subsystem_remove_host(subsystem, host);
|
||||
}
|
||||
|
||||
TAILQ_FOREACH_SAFE(ctrlr, &subsystem->ctrlrs, link, ctrlr_tmp) {
|
||||
@ -614,7 +614,7 @@ spdk_nvmf_subsystem_get_next(struct spdk_nvmf_subsystem *subsystem)
|
||||
}
|
||||
|
||||
static struct spdk_nvmf_host *
|
||||
_spdk_nvmf_subsystem_find_host(struct spdk_nvmf_subsystem *subsystem, const char *hostnqn)
|
||||
nvmf_subsystem_find_host(struct spdk_nvmf_subsystem *subsystem, const char *hostnqn)
|
||||
{
|
||||
struct spdk_nvmf_host *host = NULL;
|
||||
|
||||
@ -641,7 +641,7 @@ spdk_nvmf_subsystem_add_host(struct spdk_nvmf_subsystem *subsystem, const char *
|
||||
return -EAGAIN;
|
||||
}
|
||||
|
||||
if (_spdk_nvmf_subsystem_find_host(subsystem, hostnqn)) {
|
||||
if (nvmf_subsystem_find_host(subsystem, hostnqn)) {
|
||||
/* This subsystem already allows the specified host. */
|
||||
return 0;
|
||||
}
|
||||
@ -669,12 +669,12 @@ spdk_nvmf_subsystem_remove_host(struct spdk_nvmf_subsystem *subsystem, const cha
|
||||
return -EAGAIN;
|
||||
}
|
||||
|
||||
host = _spdk_nvmf_subsystem_find_host(subsystem, hostnqn);
|
||||
host = nvmf_subsystem_find_host(subsystem, hostnqn);
|
||||
if (host == NULL) {
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
_spdk_nvmf_subsystem_remove_host(subsystem, host);
|
||||
nvmf_subsystem_remove_host(subsystem, host);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -708,7 +708,7 @@ spdk_nvmf_subsystem_host_allowed(struct spdk_nvmf_subsystem *subsystem, const ch
|
||||
return true;
|
||||
}
|
||||
|
||||
return _spdk_nvmf_subsystem_find_host(subsystem, hostnqn) != NULL;
|
||||
return nvmf_subsystem_find_host(subsystem, hostnqn) != NULL;
|
||||
}
|
||||
|
||||
struct spdk_nvmf_host *
|
||||
|
||||
@ -522,7 +522,7 @@ nvmf_tcp_create(struct spdk_nvmf_transport_opts *opts)
|
||||
}
|
||||
|
||||
static int
|
||||
_spdk_nvmf_tcp_trsvcid_to_int(const char *trsvcid)
|
||||
nvmf_tcp_trsvcid_to_int(const char *trsvcid)
|
||||
{
|
||||
unsigned long long ull;
|
||||
char *end = NULL;
|
||||
@ -544,12 +544,12 @@ _spdk_nvmf_tcp_trsvcid_to_int(const char *trsvcid)
|
||||
* Canonicalize a listen address trid.
|
||||
*/
|
||||
static int
|
||||
_spdk_nvmf_tcp_canon_listen_trid(struct spdk_nvme_transport_id *canon_trid,
|
||||
const struct spdk_nvme_transport_id *trid)
|
||||
nvmf_tcp_canon_listen_trid(struct spdk_nvme_transport_id *canon_trid,
|
||||
const struct spdk_nvme_transport_id *trid)
|
||||
{
|
||||
int trsvcid_int;
|
||||
|
||||
trsvcid_int = _spdk_nvmf_tcp_trsvcid_to_int(trid->trsvcid);
|
||||
trsvcid_int = nvmf_tcp_trsvcid_to_int(trid->trsvcid);
|
||||
if (trsvcid_int < 0) {
|
||||
return -EINVAL;
|
||||
}
|
||||
@ -569,13 +569,13 @@ _spdk_nvmf_tcp_canon_listen_trid(struct spdk_nvme_transport_id *canon_trid,
|
||||
* Caller must hold ttransport->lock.
|
||||
*/
|
||||
static struct spdk_nvmf_tcp_port *
|
||||
_spdk_nvmf_tcp_find_port(struct spdk_nvmf_tcp_transport *ttransport,
|
||||
const struct spdk_nvme_transport_id *trid)
|
||||
nvmf_tcp_find_port(struct spdk_nvmf_tcp_transport *ttransport,
|
||||
const struct spdk_nvme_transport_id *trid)
|
||||
{
|
||||
struct spdk_nvme_transport_id canon_trid;
|
||||
struct spdk_nvmf_tcp_port *port;
|
||||
|
||||
if (_spdk_nvmf_tcp_canon_listen_trid(&canon_trid, trid) != 0) {
|
||||
if (nvmf_tcp_canon_listen_trid(&canon_trid, trid) != 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -600,7 +600,7 @@ nvmf_tcp_listen(struct spdk_nvmf_transport *transport,
|
||||
|
||||
ttransport = SPDK_CONTAINEROF(transport, struct spdk_nvmf_tcp_transport, transport);
|
||||
|
||||
trsvcid_int = _spdk_nvmf_tcp_trsvcid_to_int(trid->trsvcid);
|
||||
trsvcid_int = nvmf_tcp_trsvcid_to_int(trid->trsvcid);
|
||||
if (trsvcid_int < 0) {
|
||||
SPDK_ERRLOG("Invalid trsvcid '%s'\n", trid->trsvcid);
|
||||
return -EINVAL;
|
||||
@ -667,7 +667,7 @@ nvmf_tcp_stop_listen(struct spdk_nvmf_transport *transport,
|
||||
trid->traddr, trid->trsvcid);
|
||||
|
||||
pthread_mutex_lock(&ttransport->lock);
|
||||
port = _spdk_nvmf_tcp_find_port(ttransport, trid);
|
||||
port = nvmf_tcp_find_port(ttransport, trid);
|
||||
if (port) {
|
||||
TAILQ_REMOVE(&ttransport->ports, port, link);
|
||||
spdk_sock_close(&port->listen_sock);
|
||||
@ -871,10 +871,10 @@ nvmf_tcp_qpair_sock_init(struct spdk_nvmf_tcp_qpair *tqpair)
|
||||
}
|
||||
|
||||
static void
|
||||
_spdk_nvmf_tcp_handle_connect(struct spdk_nvmf_transport *transport,
|
||||
struct spdk_nvmf_tcp_port *port,
|
||||
struct spdk_sock *sock,
|
||||
new_qpair_fn cb_fn, void *cb_arg)
|
||||
nvmf_tcp_handle_connect(struct spdk_nvmf_transport *transport,
|
||||
struct spdk_nvmf_tcp_port *port,
|
||||
struct spdk_sock *sock,
|
||||
new_qpair_fn cb_fn, void *cb_arg)
|
||||
{
|
||||
struct spdk_nvmf_tcp_qpair *tqpair;
|
||||
int rc;
|
||||
@ -919,7 +919,7 @@ nvmf_tcp_port_accept(struct spdk_nvmf_transport *transport, struct spdk_nvmf_tcp
|
||||
if (sock == NULL) {
|
||||
break;
|
||||
}
|
||||
_spdk_nvmf_tcp_handle_connect(transport, port, sock, cb_fn, cb_arg);
|
||||
nvmf_tcp_handle_connect(transport, port, sock, cb_fn, cb_arg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -255,21 +255,21 @@ spdk_nvmf_transport_stop_listen(struct spdk_nvmf_transport *transport,
|
||||
}
|
||||
|
||||
void
|
||||
spdk_nvmf_transport_accept(struct spdk_nvmf_transport *transport, new_qpair_fn cb_fn, void *cb_arg)
|
||||
nvmf_transport_accept(struct spdk_nvmf_transport *transport, new_qpair_fn cb_fn, void *cb_arg)
|
||||
{
|
||||
transport->ops->accept(transport, cb_fn, cb_arg);
|
||||
}
|
||||
|
||||
void
|
||||
spdk_nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport,
|
||||
struct spdk_nvme_transport_id *trid,
|
||||
struct spdk_nvmf_discovery_log_page_entry *entry)
|
||||
nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport,
|
||||
struct spdk_nvme_transport_id *trid,
|
||||
struct spdk_nvmf_discovery_log_page_entry *entry)
|
||||
{
|
||||
transport->ops->listener_discover(transport, trid, entry);
|
||||
}
|
||||
|
||||
struct spdk_nvmf_transport_poll_group *
|
||||
spdk_nvmf_transport_poll_group_create(struct spdk_nvmf_transport *transport)
|
||||
nvmf_transport_poll_group_create(struct spdk_nvmf_transport *transport)
|
||||
{
|
||||
struct spdk_nvmf_transport_poll_group *group;
|
||||
struct spdk_nvmf_transport_pg_cache_buf *buf;
|
||||
@ -300,8 +300,8 @@ spdk_nvmf_transport_poll_group_create(struct spdk_nvmf_transport *transport)
|
||||
}
|
||||
|
||||
struct spdk_nvmf_transport_poll_group *
|
||||
spdk_nvmf_transport_get_optimal_poll_group(struct spdk_nvmf_transport *transport,
|
||||
struct spdk_nvmf_qpair *qpair)
|
||||
nvmf_transport_get_optimal_poll_group(struct spdk_nvmf_transport *transport,
|
||||
struct spdk_nvmf_qpair *qpair)
|
||||
{
|
||||
if (transport->ops->get_optimal_poll_group) {
|
||||
return transport->ops->get_optimal_poll_group(qpair);
|
||||
@ -311,7 +311,7 @@ spdk_nvmf_transport_get_optimal_poll_group(struct spdk_nvmf_transport *transport
|
||||
}
|
||||
|
||||
void
|
||||
spdk_nvmf_transport_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group)
|
||||
nvmf_transport_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group)
|
||||
{
|
||||
struct spdk_nvmf_transport_pg_cache_buf *buf, *tmp;
|
||||
|
||||
@ -327,8 +327,8 @@ spdk_nvmf_transport_poll_group_destroy(struct spdk_nvmf_transport_poll_group *gr
|
||||
}
|
||||
|
||||
int
|
||||
spdk_nvmf_transport_poll_group_add(struct spdk_nvmf_transport_poll_group *group,
|
||||
struct spdk_nvmf_qpair *qpair)
|
||||
nvmf_transport_poll_group_add(struct spdk_nvmf_transport_poll_group *group,
|
||||
struct spdk_nvmf_qpair *qpair)
|
||||
{
|
||||
if (qpair->transport) {
|
||||
assert(qpair->transport == group->transport);
|
||||
@ -343,8 +343,8 @@ spdk_nvmf_transport_poll_group_add(struct spdk_nvmf_transport_poll_group *group,
|
||||
}
|
||||
|
||||
int
|
||||
spdk_nvmf_transport_poll_group_remove(struct spdk_nvmf_transport_poll_group *group,
|
||||
struct spdk_nvmf_qpair *qpair)
|
||||
nvmf_transport_poll_group_remove(struct spdk_nvmf_transport_poll_group *group,
|
||||
struct spdk_nvmf_qpair *qpair)
|
||||
{
|
||||
int rc = ENOTSUP;
|
||||
|
||||
@ -357,46 +357,46 @@ spdk_nvmf_transport_poll_group_remove(struct spdk_nvmf_transport_poll_group *gro
|
||||
}
|
||||
|
||||
int
|
||||
spdk_nvmf_transport_poll_group_poll(struct spdk_nvmf_transport_poll_group *group)
|
||||
nvmf_transport_poll_group_poll(struct spdk_nvmf_transport_poll_group *group)
|
||||
{
|
||||
return group->transport->ops->poll_group_poll(group);
|
||||
}
|
||||
|
||||
int
|
||||
spdk_nvmf_transport_req_free(struct spdk_nvmf_request *req)
|
||||
nvmf_transport_req_free(struct spdk_nvmf_request *req)
|
||||
{
|
||||
return req->qpair->transport->ops->req_free(req);
|
||||
}
|
||||
|
||||
int
|
||||
spdk_nvmf_transport_req_complete(struct spdk_nvmf_request *req)
|
||||
nvmf_transport_req_complete(struct spdk_nvmf_request *req)
|
||||
{
|
||||
return req->qpair->transport->ops->req_complete(req);
|
||||
}
|
||||
|
||||
void
|
||||
spdk_nvmf_transport_qpair_fini(struct spdk_nvmf_qpair *qpair)
|
||||
nvmf_transport_qpair_fini(struct spdk_nvmf_qpair *qpair)
|
||||
{
|
||||
qpair->transport->ops->qpair_fini(qpair);
|
||||
}
|
||||
|
||||
int
|
||||
spdk_nvmf_transport_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair,
|
||||
struct spdk_nvme_transport_id *trid)
|
||||
nvmf_transport_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair,
|
||||
struct spdk_nvme_transport_id *trid)
|
||||
{
|
||||
return qpair->transport->ops->qpair_get_peer_trid(qpair, trid);
|
||||
}
|
||||
|
||||
int
|
||||
spdk_nvmf_transport_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair,
|
||||
struct spdk_nvme_transport_id *trid)
|
||||
nvmf_transport_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair,
|
||||
struct spdk_nvme_transport_id *trid)
|
||||
{
|
||||
return qpair->transport->ops->qpair_get_local_trid(qpair, trid);
|
||||
}
|
||||
|
||||
int
|
||||
spdk_nvmf_transport_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair,
|
||||
struct spdk_nvme_transport_id *trid)
|
||||
nvmf_transport_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair,
|
||||
struct spdk_nvme_transport_id *trid)
|
||||
{
|
||||
return qpair->transport->ops->qpair_get_listen_trid(qpair, trid);
|
||||
}
|
||||
|
||||
@ -40,44 +40,41 @@
|
||||
#include "spdk/nvmf.h"
|
||||
#include "spdk/nvmf_transport.h"
|
||||
|
||||
void spdk_nvmf_transport_accept(struct spdk_nvmf_transport *transport, new_qpair_fn cb_fn,
|
||||
void *cb_arg);
|
||||
void nvmf_transport_accept(struct spdk_nvmf_transport *transport, new_qpair_fn cb_fn,
|
||||
void *cb_arg);
|
||||
|
||||
void spdk_nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport,
|
||||
struct spdk_nvme_transport_id *trid,
|
||||
struct spdk_nvmf_discovery_log_page_entry *entry);
|
||||
void nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport,
|
||||
struct spdk_nvme_transport_id *trid,
|
||||
struct spdk_nvmf_discovery_log_page_entry *entry);
|
||||
|
||||
struct spdk_nvmf_transport_poll_group *spdk_nvmf_transport_poll_group_create(
|
||||
struct spdk_nvmf_transport_poll_group *nvmf_transport_poll_group_create(
|
||||
struct spdk_nvmf_transport *transport);
|
||||
struct spdk_nvmf_transport_poll_group *spdk_nvmf_transport_get_optimal_poll_group(
|
||||
struct spdk_nvmf_transport_poll_group *nvmf_transport_get_optimal_poll_group(
|
||||
struct spdk_nvmf_transport *transport, struct spdk_nvmf_qpair *qpair);
|
||||
|
||||
void spdk_nvmf_transport_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group);
|
||||
void nvmf_transport_poll_group_destroy(struct spdk_nvmf_transport_poll_group *group);
|
||||
|
||||
int spdk_nvmf_transport_poll_group_add(struct spdk_nvmf_transport_poll_group *group,
|
||||
struct spdk_nvmf_qpair *qpair);
|
||||
int nvmf_transport_poll_group_add(struct spdk_nvmf_transport_poll_group *group,
|
||||
struct spdk_nvmf_qpair *qpair);
|
||||
|
||||
int spdk_nvmf_transport_poll_group_remove(struct spdk_nvmf_transport_poll_group *group,
|
||||
struct spdk_nvmf_qpair *qpair);
|
||||
int nvmf_transport_poll_group_remove(struct spdk_nvmf_transport_poll_group *group,
|
||||
struct spdk_nvmf_qpair *qpair);
|
||||
|
||||
int spdk_nvmf_transport_poll_group_poll(struct spdk_nvmf_transport_poll_group *group);
|
||||
int nvmf_transport_poll_group_poll(struct spdk_nvmf_transport_poll_group *group);
|
||||
|
||||
int spdk_nvmf_transport_req_free(struct spdk_nvmf_request *req);
|
||||
int nvmf_transport_req_free(struct spdk_nvmf_request *req);
|
||||
|
||||
int spdk_nvmf_transport_req_complete(struct spdk_nvmf_request *req);
|
||||
int nvmf_transport_req_complete(struct spdk_nvmf_request *req);
|
||||
|
||||
void spdk_nvmf_transport_qpair_fini(struct spdk_nvmf_qpair *qpair);
|
||||
void nvmf_transport_qpair_fini(struct spdk_nvmf_qpair *qpair);
|
||||
|
||||
int spdk_nvmf_transport_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair,
|
||||
int nvmf_transport_qpair_get_peer_trid(struct spdk_nvmf_qpair *qpair,
|
||||
struct spdk_nvme_transport_id *trid);
|
||||
|
||||
int nvmf_transport_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair,
|
||||
struct spdk_nvme_transport_id *trid);
|
||||
|
||||
int nvmf_transport_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair,
|
||||
struct spdk_nvme_transport_id *trid);
|
||||
|
||||
int spdk_nvmf_transport_qpair_get_local_trid(struct spdk_nvmf_qpair *qpair,
|
||||
struct spdk_nvme_transport_id *trid);
|
||||
|
||||
int spdk_nvmf_transport_qpair_get_listen_trid(struct spdk_nvmf_qpair *qpair,
|
||||
struct spdk_nvme_transport_id *trid);
|
||||
|
||||
bool spdk_nvmf_transport_opts_init(const char *transport_name,
|
||||
struct spdk_nvmf_transport_opts *opts);
|
||||
|
||||
#endif /* SPDK_NVMF_TRANSPORT_H */
|
||||
|
||||
@ -167,7 +167,7 @@ DEFINE_STUB(nvmf_bdev_ctrlr_nvme_passthru_io,
|
||||
struct spdk_nvmf_request *req),
|
||||
0);
|
||||
|
||||
DEFINE_STUB(spdk_nvmf_transport_req_complete,
|
||||
DEFINE_STUB(nvmf_transport_req_complete,
|
||||
int,
|
||||
(struct spdk_nvmf_request *req),
|
||||
0);
|
||||
|
||||
@ -94,9 +94,9 @@ nvmf_transport_find_listener(struct spdk_nvmf_transport *transport,
|
||||
}
|
||||
|
||||
void
|
||||
spdk_nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport,
|
||||
struct spdk_nvme_transport_id *trid,
|
||||
struct spdk_nvmf_discovery_log_page_entry *entry)
|
||||
nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport,
|
||||
struct spdk_nvme_transport_id *trid,
|
||||
struct spdk_nvmf_discovery_log_page_entry *entry)
|
||||
{
|
||||
entry->trtype = 42;
|
||||
}
|
||||
|
||||
@ -344,11 +344,11 @@ create_fc_port_test(void)
|
||||
init_args.io_queues = (void *)lld_q;
|
||||
|
||||
set_thread(0);
|
||||
err = spdk_nvmf_fc_master_enqueue_event(SPDK_FC_HW_PORT_INIT, (void *)&init_args, port_init_cb);
|
||||
err = nvmf_fc_master_enqueue_event(SPDK_FC_HW_PORT_INIT, (void *)&init_args, port_init_cb);
|
||||
CU_ASSERT(err == 0);
|
||||
poll_thread(0);
|
||||
|
||||
fc_port = spdk_nvmf_fc_port_lookup(g_fc_port_handle);
|
||||
fc_port = nvmf_fc_port_lookup(g_fc_port_handle);
|
||||
CU_ASSERT(fc_port != NULL);
|
||||
}
|
||||
|
||||
@ -361,12 +361,12 @@ online_fc_port_test(void)
|
||||
|
||||
SPDK_CU_ASSERT_FATAL(g_nvmf_tprt != NULL);
|
||||
|
||||
fc_port = spdk_nvmf_fc_port_lookup(g_fc_port_handle);
|
||||
fc_port = nvmf_fc_port_lookup(g_fc_port_handle);
|
||||
SPDK_CU_ASSERT_FATAL(fc_port != NULL);
|
||||
|
||||
set_thread(0);
|
||||
args.port_handle = g_fc_port_handle;
|
||||
err = spdk_nvmf_fc_master_enqueue_event(SPDK_FC_HW_PORT_ONLINE, (void *)&args, port_init_cb);
|
||||
err = nvmf_fc_master_enqueue_event(SPDK_FC_HW_PORT_ONLINE, (void *)&args, port_init_cb);
|
||||
CU_ASSERT(err == 0);
|
||||
poll_threads();
|
||||
set_thread(0);
|
||||
@ -406,7 +406,7 @@ poll_group_poll_test(void)
|
||||
SPDK_CU_ASSERT_FATAL(g_nvmf_tprt != NULL);
|
||||
|
||||
set_thread(0);
|
||||
fc_port = spdk_nvmf_fc_port_lookup(g_fc_port_handle);
|
||||
fc_port = nvmf_fc_port_lookup(g_fc_port_handle);
|
||||
SPDK_CU_ASSERT_FATAL(fc_port != NULL);
|
||||
|
||||
for (i = 0; i < fc_port->num_io_queues; i++) {
|
||||
@ -432,11 +432,11 @@ remove_hwqps_from_poll_groups_test(void)
|
||||
|
||||
SPDK_CU_ASSERT_FATAL(g_nvmf_tprt != NULL);
|
||||
|
||||
fc_port = spdk_nvmf_fc_port_lookup(g_fc_port_handle);
|
||||
fc_port = nvmf_fc_port_lookup(g_fc_port_handle);
|
||||
SPDK_CU_ASSERT_FATAL(fc_port != NULL);
|
||||
|
||||
for (i = 0; i < fc_port->num_io_queues; i++) {
|
||||
spdk_nvmf_fc_poll_group_remove_hwqp(&fc_port->io_queues[i]);
|
||||
nvmf_fc_poll_group_remove_hwqp(&fc_port->io_queues[i]);
|
||||
poll_threads();
|
||||
CU_ASSERT(fc_port->io_queues[i].fgroup == 0);
|
||||
}
|
||||
|
||||
@ -77,14 +77,11 @@ static struct spdk_nvmf_transport_opts g_nvmf_transport_opts = {
|
||||
static uint32_t g_hw_queue_depth = 1024;
|
||||
static struct spdk_nvmf_subsystem g_nvmf_subsystem;
|
||||
|
||||
|
||||
int spdk_nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *g_tgt_port,
|
||||
struct spdk_nvmf_fc_ls_rqst *ls_rqst);
|
||||
void spdk_nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts,
|
||||
spdk_nvmf_fc_caller_cb cb, void *cb_args);
|
||||
void nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts,
|
||||
spdk_nvmf_fc_caller_cb cb, void *cb_args);
|
||||
void spdk_bdev_io_abort(struct spdk_bdev_io *bdev_io, void *ctx);
|
||||
void spdk_nvmf_fc_request_abort_complete(void *arg1);
|
||||
bool spdk_nvmf_fc_req_in_xfer(struct spdk_nvmf_fc_request *fc_req);
|
||||
void nvmf_fc_request_abort_complete(void *arg1);
|
||||
bool nvmf_fc_req_in_xfer(struct spdk_nvmf_fc_request *fc_req);
|
||||
|
||||
struct spdk_nvmf_subsystem *
|
||||
spdk_nvmf_tgt_find_subsystem(struct spdk_nvmf_tgt *tgt, const char *subnqn)
|
||||
@ -177,7 +174,7 @@ new_qpair(struct spdk_nvmf_qpair *qpair, void *cb_arg)
|
||||
fc_conn->fc_assoc->assoc_id = fc_conn->conn_id;
|
||||
}
|
||||
|
||||
spdk_nvmf_fc_poller_api_func(sel_hwqp, SPDK_NVMF_FC_POLLER_API_ADD_CONNECTION, &api_data->args);
|
||||
nvmf_fc_poller_api_func(sel_hwqp, SPDK_NVMF_FC_POLLER_API_ADD_CONNECTION, &api_data->args);
|
||||
|
||||
return;
|
||||
err:
|
||||
@ -186,7 +183,7 @@ err:
|
||||
}
|
||||
|
||||
struct spdk_nvmf_fc_conn *
|
||||
spdk_nvmf_fc_hwqp_find_fc_conn(struct spdk_nvmf_fc_hwqp *hwqp, uint64_t conn_id)
|
||||
nvmf_fc_hwqp_find_fc_conn(struct spdk_nvmf_fc_hwqp *hwqp, uint64_t conn_id)
|
||||
{
|
||||
struct spdk_nvmf_fc_conn *fc_conn;
|
||||
|
||||
@ -279,12 +276,6 @@ nvmf_fc_free_srsr_bufs(struct spdk_nvmf_fc_srsr_bufs *srsr_bufs)
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *tgtport, struct spdk_nvmf_fc_ls_rqst *ls_rqst)
|
||||
{
|
||||
return spdk_nvmf_fc_xmt_ls_rsp(tgtport, ls_rqst);
|
||||
}
|
||||
|
||||
/*
|
||||
* The Tests
|
||||
*/
|
||||
@ -341,7 +332,7 @@ run_create_assoc_test(const char *subnqn,
|
||||
ls_rqst.rport = &g_rem_port;
|
||||
ls_rqst.nvmf_tgt = &g_nvmf_tgt;
|
||||
|
||||
spdk_nvmf_fc_handle_ls_rqst(&ls_rqst);
|
||||
nvmf_fc_handle_ls_rqst(&ls_rqst);
|
||||
poll_thread(0);
|
||||
}
|
||||
|
||||
@ -391,7 +382,7 @@ run_create_conn_test(struct spdk_nvmf_host *host,
|
||||
ls_rqst.rport = &g_rem_port;
|
||||
ls_rqst.nvmf_tgt = &g_nvmf_tgt;
|
||||
|
||||
spdk_nvmf_fc_handle_ls_rqst(&ls_rqst);
|
||||
nvmf_fc_handle_ls_rqst(&ls_rqst);
|
||||
poll_thread(0);
|
||||
}
|
||||
|
||||
@ -435,7 +426,7 @@ run_disconn_test(struct spdk_nvmf_fc_nport *tgt_port,
|
||||
ls_rqst.rport = &g_rem_port;
|
||||
ls_rqst.nvmf_tgt = &g_nvmf_tgt;
|
||||
|
||||
spdk_nvmf_fc_handle_ls_rqst(&ls_rqst);
|
||||
nvmf_fc_handle_ls_rqst(&ls_rqst);
|
||||
poll_thread(0);
|
||||
}
|
||||
|
||||
@ -713,7 +704,7 @@ ls_tests_init(void)
|
||||
hwqp->fgroup = &g_fgroup[i];
|
||||
}
|
||||
|
||||
spdk_nvmf_fc_ls_init(&g_fc_port);
|
||||
nvmf_fc_ls_init(&g_fc_port);
|
||||
bzero(&g_tgt_port, sizeof(struct spdk_nvmf_fc_nport));
|
||||
g_tgt_port.fc_port = &g_fc_port;
|
||||
TAILQ_INIT(&g_tgt_port.rem_port_list);
|
||||
@ -728,7 +719,7 @@ ls_tests_init(void)
|
||||
static int
|
||||
ls_tests_fini(void)
|
||||
{
|
||||
spdk_nvmf_fc_ls_fini(&g_fc_port);
|
||||
nvmf_fc_ls_fini(&g_fc_port);
|
||||
free_threads();
|
||||
return 0;
|
||||
}
|
||||
@ -829,8 +820,8 @@ create_max_aq_conns_test(void)
|
||||
for (i = 0; i < create_assoc_test_cnt; i++) {
|
||||
int ret;
|
||||
g_spdk_nvmf_fc_xmt_srsr_req = false;
|
||||
ret = spdk_nvmf_fc_delete_association(&g_tgt_port, from_be64(&assoc_id[i]), true, false,
|
||||
disconnect_assoc_cb, 0);
|
||||
ret = nvmf_fc_delete_association(&g_tgt_port, from_be64(&assoc_id[i]), true, false,
|
||||
disconnect_assoc_cb, 0);
|
||||
CU_ASSERT(ret == 0);
|
||||
poll_thread(0);
|
||||
|
||||
@ -869,8 +860,8 @@ disconnect_bad_assoc_test(void)
|
||||
*/
|
||||
|
||||
int
|
||||
spdk_nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *g_tgt_port,
|
||||
struct spdk_nvmf_fc_ls_rqst *ls_rqst)
|
||||
nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *g_tgt_port,
|
||||
struct spdk_nvmf_fc_ls_rqst *ls_rqst)
|
||||
{
|
||||
switch (g_test_run_type) {
|
||||
case TEST_RUN_TYPE_CREATE_ASSOC:
|
||||
@ -904,9 +895,9 @@ spdk_nvmf_fc_xmt_ls_rsp(struct spdk_nvmf_fc_nport *g_tgt_port,
|
||||
}
|
||||
|
||||
int
|
||||
spdk_nvmf_fc_xmt_srsr_req(struct spdk_nvmf_fc_hwqp *hwqp,
|
||||
struct spdk_nvmf_fc_srsr_bufs *srsr_bufs,
|
||||
spdk_nvmf_fc_caller_cb cb, void *cb_args)
|
||||
nvmf_fc_xmt_srsr_req(struct spdk_nvmf_fc_hwqp *hwqp,
|
||||
struct spdk_nvmf_fc_srsr_bufs *srsr_bufs,
|
||||
spdk_nvmf_fc_caller_cb cb, void *cb_args)
|
||||
{
|
||||
struct spdk_nvmf_fc_ls_disconnect_rqst *dc_rqst =
|
||||
(struct spdk_nvmf_fc_ls_disconnect_rqst *)
|
||||
@ -931,10 +922,10 @@ spdk_nvmf_fc_xmt_srsr_req(struct spdk_nvmf_fc_hwqp *hwqp,
|
||||
return 0;
|
||||
}
|
||||
|
||||
DEFINE_STUB_V(spdk_nvmf_fc_request_abort, (struct spdk_nvmf_fc_request *fc_req,
|
||||
bool send_abts, spdk_nvmf_fc_caller_cb cb, void *cb_args));
|
||||
DEFINE_STUB_V(nvmf_fc_request_abort, (struct spdk_nvmf_fc_request *fc_req,
|
||||
bool send_abts, spdk_nvmf_fc_caller_cb cb, void *cb_args));
|
||||
DEFINE_STUB_V(spdk_bdev_io_abort, (struct spdk_bdev_io *bdev_io, void *ctx));
|
||||
DEFINE_STUB_V(spdk_nvmf_fc_request_abort_complete, (void *arg1));
|
||||
DEFINE_STUB_V(nvmf_fc_request_abort_complete, (void *arg1));
|
||||
|
||||
static void
|
||||
usage(const char *program_name)
|
||||
|
||||
@ -72,9 +72,9 @@ spdk_nvmf_transport_listen(struct spdk_nvmf_transport *transport,
|
||||
}
|
||||
|
||||
void
|
||||
spdk_nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport,
|
||||
struct spdk_nvme_transport_id *trid,
|
||||
struct spdk_nvmf_discovery_log_page_entry *entry)
|
||||
nvmf_transport_listener_discover(struct spdk_nvmf_transport *transport,
|
||||
struct spdk_nvme_transport_id *trid,
|
||||
struct spdk_nvmf_discovery_log_page_entry *entry)
|
||||
{
|
||||
entry->trtype = 42;
|
||||
}
|
||||
|
||||
@ -168,7 +168,7 @@ DEFINE_STUB(nvmf_bdev_ctrlr_get_dif_ctx,
|
||||
(struct spdk_bdev *bdev, struct spdk_nvme_cmd *cmd, struct spdk_dif_ctx *dif_ctx),
|
||||
false);
|
||||
|
||||
DEFINE_STUB(spdk_nvmf_transport_req_complete,
|
||||
DEFINE_STUB(nvmf_transport_req_complete,
|
||||
int,
|
||||
(struct spdk_nvmf_request *req),
|
||||
0);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user