ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf: Rename spdk_nvmf_tgt_poll to spdk_nvmf_tgt_accept

Browse Source 
This function accepts new connections, so use the more
traditional name.

Change-Id: Ie4aaa4b1d6da81f81fa3cd1505e5ac45e157f052
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/375205
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Ben Walker 2017-08-21 14:07:44 -07:00 committed by Jim Harris
parent f97fa311e2
commit 3d8e67d71f
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/nvmf_tgt/nvmf_tgt.c
View File

@ -265,7 +265,9 @@ nvmf_tgt_shutdown_subsystem_by_nqn(const char *nqn)
static void static void
acceptor_poll(void *arg) acceptor_poll(void *arg)
{ {
spdk_nvmf_tgt_poll(); struct spdk_nvmf_tgt *tgt = arg;
spdk_nvmf_tgt_accept(tgt);
} }
static void static void
@ -284,7 +286,7 @@ spdk_nvmf_startup(void *arg1, void *arg2)
goto initialize_error; goto initialize_error;
} }
spdk_poller_register(&g_acceptor_poller, acceptor_poll, NULL, spdk_poller_register(&g_acceptor_poller, acceptor_poll, g_tgt,
g_spdk_nvmf_tgt_conf.acceptor_lcore, g_spdk_nvmf_tgt_conf.acceptor_lcore,
g_spdk_nvmf_tgt_conf.acceptor_poll_rate); g_spdk_nvmf_tgt_conf.acceptor_poll_rate);

7
include/spdk/nvmf.h
View File

@ -84,6 +84,11 @@ void spdk_nvmf_tgt_destroy(struct spdk_nvmf_tgt *tgt);
struct spdk_nvmf_listen_addr *spdk_nvmf_tgt_listen(struct spdk_nvmf_tgt *tgt, struct spdk_nvmf_listen_addr *spdk_nvmf_tgt_listen(struct spdk_nvmf_tgt *tgt,
struct spdk_nvme_transport_id *trid); struct spdk_nvme_transport_id *trid);
/**
* Poll the target for incoming connections.
*/
void spdk_nvmf_tgt_accept(struct spdk_nvmf_tgt *tgt);
struct spdk_nvmf_subsystem; struct spdk_nvmf_subsystem;
struct spdk_nvmf_ctrlr; struct spdk_nvmf_ctrlr;
struct spdk_nvmf_qpair; struct spdk_nvmf_qpair;
@ -289,8 +294,6 @@ int spdk_nvmf_subsystem_set_sn(struct spdk_nvmf_subsystem *subsystem, const char
const char *spdk_nvmf_subsystem_get_nqn(struct spdk_nvmf_subsystem *subsystem); 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); enum spdk_nvmf_subtype spdk_nvmf_subsystem_get_type(struct spdk_nvmf_subsystem *subsystem);
void spdk_nvmf_tgt_poll(void);
void spdk_nvmf_handle_connect(struct spdk_nvmf_request *req); void spdk_nvmf_handle_connect(struct spdk_nvmf_request *req);
void spdk_nvmf_ctrlr_disconnect(struct spdk_nvmf_qpair *qpair); void spdk_nvmf_ctrlr_disconnect(struct spdk_nvmf_qpair *qpair);

4
lib/nvmf/nvmf.c
View File

@ -218,11 +218,11 @@ spdk_nvmf_listen_addr_destroy(struct spdk_nvmf_listen_addr *addr)
} }
void void
spdk_nvmf_tgt_poll(void) spdk_nvmf_tgt_accept(struct spdk_nvmf_tgt *tgt)
{ {
struct spdk_nvmf_transport *transport, *tmp; struct spdk_nvmf_transport *transport, *tmp;
TAILQ_FOREACH_SAFE(transport, &g_nvmf_tgt.transports, link, tmp) { TAILQ_FOREACH_SAFE(transport, &tgt->transports, link, tmp) {
spdk_nvmf_transport_accept(transport); spdk_nvmf_transport_accept(transport);
} }
} }