From c79d4eef85294403470e8940c932692fe67a3a82 Mon Sep 17 00:00:00 2001 From: Jacek Kalwas Date: Sat, 15 Feb 2020 06:47:36 +0100 Subject: [PATCH] nvmf: rename listener to subsystem listener Signed-off-by: Jacek Kalwas Change-Id: I5c1e009114bdf8e8b59e0ca07fbae0900131a58e Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/913 Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Shuhei Matsumoto --- include/spdk/nvmf.h | 12 ++++++------ lib/nvmf/ctrlr_discovery.c | 2 +- lib/nvmf/nvmf.c | 4 ++-- lib/nvmf/nvmf_internal.h | 23 +++++++++++------------ lib/nvmf/nvmf_rpc.c | 6 +++--- lib/nvmf/subsystem.c | 22 +++++++++++----------- 6 files changed, 34 insertions(+), 35 deletions(-) diff --git a/include/spdk/nvmf.h b/include/spdk/nvmf.h index d58173d53..6ec9e5e78 100644 --- a/include/spdk/nvmf.h +++ b/include/spdk/nvmf.h @@ -60,7 +60,7 @@ struct spdk_nvmf_request; struct spdk_bdev; struct spdk_nvmf_request; struct spdk_nvmf_host; -struct spdk_nvmf_listener; +struct spdk_nvmf_subsystem_listener; struct spdk_nvmf_poll_group; struct spdk_json_write_ctx; struct spdk_nvmf_transport; @@ -611,7 +611,7 @@ bool spdk_nvmf_subsystem_listener_allowed(struct spdk_nvmf_subsystem *subsystem, * * \return first allowed listen address in this subsystem, or NULL if none allowed. */ -struct spdk_nvmf_listener *spdk_nvmf_subsystem_get_first_listener( +struct spdk_nvmf_subsystem_listener *spdk_nvmf_subsystem_get_first_listener( struct spdk_nvmf_subsystem *subsystem); /** @@ -623,9 +623,9 @@ struct spdk_nvmf_listener *spdk_nvmf_subsystem_get_first_listener( * \return next allowed listen address in this subsystem, or NULL if prev_listener * was the last address. */ -struct spdk_nvmf_listener *spdk_nvmf_subsystem_get_next_listener( +struct spdk_nvmf_subsystem_listener *spdk_nvmf_subsystem_get_next_listener( struct spdk_nvmf_subsystem *subsystem, - struct spdk_nvmf_listener *prev_listener); + struct spdk_nvmf_subsystem_listener *prev_listener); /** * Get a listen address' transport ID @@ -634,8 +634,8 @@ struct spdk_nvmf_listener *spdk_nvmf_subsystem_get_next_listener( * * \return the transport ID for this listener. */ -const struct spdk_nvme_transport_id *spdk_nvmf_listener_get_trid( - struct spdk_nvmf_listener *listener); +const struct spdk_nvme_transport_id *spdk_nvmf_subsystem_listener_get_trid( + struct spdk_nvmf_subsystem_listener *listener); /** * Set whether a subsystem should allow any listen address or only addresses in the allowed list. diff --git a/lib/nvmf/ctrlr_discovery.c b/lib/nvmf/ctrlr_discovery.c index 16ebd84ea..f5aa252b7 100644 --- a/lib/nvmf/ctrlr_discovery.c +++ b/lib/nvmf/ctrlr_discovery.c @@ -53,7 +53,7 @@ nvmf_generate_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn, size { uint64_t numrec = 0; struct spdk_nvmf_subsystem *subsystem; - struct spdk_nvmf_listener *listener; + struct spdk_nvmf_subsystem_listener *listener; struct spdk_nvmf_discovery_log_page_entry *entry; struct spdk_nvmf_discovery_log_page *disc_log; size_t cur_size; diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index b5108ac34..6555c6ab3 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -366,7 +366,7 @@ spdk_nvmf_write_subsystem_config_json(struct spdk_json_write_ctx *w, struct spdk_nvmf_subsystem *subsystem) { struct spdk_nvmf_host *host; - struct spdk_nvmf_listener *listener; + struct spdk_nvmf_subsystem_listener *listener; const struct spdk_nvme_transport_id *trid; struct spdk_nvmf_ns *ns; struct spdk_nvmf_ns_opts ns_opts; @@ -402,7 +402,7 @@ spdk_nvmf_write_subsystem_config_json(struct spdk_json_write_ctx *w, for (listener = spdk_nvmf_subsystem_get_first_listener(subsystem); listener != NULL; listener = spdk_nvmf_subsystem_get_next_listener(subsystem, listener)) { - trid = spdk_nvmf_listener_get_trid(listener); + trid = spdk_nvmf_subsystem_listener_get_trid(listener); adrfam = spdk_nvme_transport_id_adrfam_str(trid->adrfam); diff --git a/lib/nvmf/nvmf_internal.h b/lib/nvmf/nvmf_internal.h index 3014a044c..8d6156a28 100644 --- a/lib/nvmf/nvmf_internal.h +++ b/lib/nvmf/nvmf_internal.h @@ -80,10 +80,10 @@ struct spdk_nvmf_host { TAILQ_ENTRY(spdk_nvmf_host) link; }; -struct spdk_nvmf_listener { - struct spdk_nvme_transport_id trid; - struct spdk_nvmf_transport *transport; - TAILQ_ENTRY(spdk_nvmf_listener) link; +struct spdk_nvmf_subsystem_listener { + struct spdk_nvme_transport_id trid; + struct spdk_nvmf_transport *transport; + TAILQ_ENTRY(spdk_nvmf_subsystem_listener) link; }; /* Maximum number of registrants supported per namespace */ @@ -239,7 +239,7 @@ struct spdk_nvmf_subsystem { enum spdk_nvmf_subtype subtype; uint16_t next_cntlid; bool allow_any_host; - bool allow_any_listener ; + bool allow_any_listener; struct spdk_nvmf_tgt *tgt; @@ -252,11 +252,9 @@ struct spdk_nvmf_subsystem { /* This is the maximum allowed nsid to a subsystem */ uint32_t max_allowed_nsid; - TAILQ_HEAD(, spdk_nvmf_ctrlr) ctrlrs; - - TAILQ_HEAD(, spdk_nvmf_host) hosts; - - TAILQ_HEAD(, spdk_nvmf_listener) listeners; + TAILQ_HEAD(, spdk_nvmf_ctrlr) ctrlrs; + TAILQ_HEAD(, spdk_nvmf_host) hosts; + TAILQ_HEAD(, spdk_nvmf_subsystem_listener) listeners; TAILQ_ENTRY(spdk_nvmf_subsystem) entries; }; @@ -317,8 +315,9 @@ void spdk_nvmf_subsystem_remove_all_listeners(struct spdk_nvmf_subsystem *subsys bool stop); struct spdk_nvmf_ctrlr *spdk_nvmf_subsystem_get_ctrlr(struct spdk_nvmf_subsystem *subsystem, uint16_t cntlid); -struct spdk_nvmf_listener *spdk_nvmf_subsystem_find_listener(struct spdk_nvmf_subsystem *subsystem, - const struct spdk_nvme_transport_id *trid); +struct spdk_nvmf_subsystem_listener *spdk_nvmf_subsystem_find_listener( + struct spdk_nvmf_subsystem *subsystem, + const struct spdk_nvme_transport_id *trid); int spdk_nvmf_ctrlr_async_event_ns_notice(struct spdk_nvmf_ctrlr *ctrlr); void spdk_nvmf_ctrlr_async_event_reservation_notification(struct spdk_nvmf_ctrlr *ctrlr); diff --git a/lib/nvmf/nvmf_rpc.c b/lib/nvmf/nvmf_rpc.c index 5858394de..704594c1c 100644 --- a/lib/nvmf/nvmf_rpc.c +++ b/lib/nvmf/nvmf_rpc.c @@ -195,8 +195,8 @@ static const struct spdk_json_object_decoder rpc_get_subsystem_decoders[] = { static void dump_nvmf_subsystem(struct spdk_json_write_ctx *w, struct spdk_nvmf_subsystem *subsystem) { - struct spdk_nvmf_host *host; - struct spdk_nvmf_listener *listener; + struct spdk_nvmf_host *host; + struct spdk_nvmf_subsystem_listener *listener; spdk_json_write_object_begin(w); @@ -215,7 +215,7 @@ dump_nvmf_subsystem(struct spdk_json_write_ctx *w, struct spdk_nvmf_subsystem *s const struct spdk_nvme_transport_id *trid; const char *adrfam; - trid = spdk_nvmf_listener_get_trid(listener); + trid = spdk_nvmf_subsystem_listener_get_trid(listener); spdk_json_write_object_begin(w); adrfam = spdk_nvme_transport_id_adrfam_str(trid->adrfam); diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c index c62797d6d..668339ddf 100644 --- a/lib/nvmf/subsystem.c +++ b/lib/nvmf/subsystem.c @@ -314,7 +314,7 @@ _spdk_nvmf_subsystem_remove_host(struct spdk_nvmf_subsystem *subsystem, struct s static void _nvmf_subsystem_remove_listener(struct spdk_nvmf_subsystem *subsystem, - struct spdk_nvmf_listener *listener, + struct spdk_nvmf_subsystem_listener *listener, bool stop) { struct spdk_nvmf_transport *transport; @@ -732,11 +732,11 @@ spdk_nvmf_host_get_nqn(struct spdk_nvmf_host *host) return host->nqn; } -struct spdk_nvmf_listener * +struct spdk_nvmf_subsystem_listener * spdk_nvmf_subsystem_find_listener(struct spdk_nvmf_subsystem *subsystem, const struct spdk_nvme_transport_id *trid) { - struct spdk_nvmf_listener *listener; + struct spdk_nvmf_subsystem_listener *listener; TAILQ_FOREACH(listener, &subsystem->listeners, link) { if (spdk_nvme_transport_id_compare(&listener->trid, trid) == 0) { @@ -752,7 +752,7 @@ spdk_nvmf_subsystem_add_listener(struct spdk_nvmf_subsystem *subsystem, struct spdk_nvme_transport_id *trid) { struct spdk_nvmf_transport *transport; - struct spdk_nvmf_listener *listener; + struct spdk_nvmf_subsystem_listener *listener; if (!(subsystem->state == SPDK_NVMF_SUBSYSTEM_INACTIVE || subsystem->state == SPDK_NVMF_SUBSYSTEM_PAUSED)) { @@ -788,7 +788,7 @@ int spdk_nvmf_subsystem_remove_listener(struct spdk_nvmf_subsystem *subsystem, const struct spdk_nvme_transport_id *trid) { - struct spdk_nvmf_listener *listener; + struct spdk_nvmf_subsystem_listener *listener; if (!(subsystem->state == SPDK_NVMF_SUBSYSTEM_INACTIVE || subsystem->state == SPDK_NVMF_SUBSYSTEM_PAUSED)) { @@ -809,7 +809,7 @@ void spdk_nvmf_subsystem_remove_all_listeners(struct spdk_nvmf_subsystem *subsystem, bool stop) { - struct spdk_nvmf_listener *listener, *listener_tmp; + struct spdk_nvmf_subsystem_listener *listener, *listener_tmp; TAILQ_FOREACH_SAFE(listener, &subsystem->listeners, link, listener_tmp) { _nvmf_subsystem_remove_listener(subsystem, listener, stop); @@ -820,7 +820,7 @@ bool spdk_nvmf_subsystem_listener_allowed(struct spdk_nvmf_subsystem *subsystem, struct spdk_nvme_transport_id *trid) { - struct spdk_nvmf_listener *listener; + struct spdk_nvmf_subsystem_listener *listener; if (!strcmp(subsystem->subnqn, SPDK_NVMF_DISCOVERY_NQN)) { return true; @@ -835,21 +835,21 @@ spdk_nvmf_subsystem_listener_allowed(struct spdk_nvmf_subsystem *subsystem, return false; } -struct spdk_nvmf_listener * +struct spdk_nvmf_subsystem_listener * spdk_nvmf_subsystem_get_first_listener(struct spdk_nvmf_subsystem *subsystem) { return TAILQ_FIRST(&subsystem->listeners); } -struct spdk_nvmf_listener * +struct spdk_nvmf_subsystem_listener * spdk_nvmf_subsystem_get_next_listener(struct spdk_nvmf_subsystem *subsystem, - struct spdk_nvmf_listener *prev_listener) + struct spdk_nvmf_subsystem_listener *prev_listener) { return TAILQ_NEXT(prev_listener, link); } const struct spdk_nvme_transport_id * -spdk_nvmf_listener_get_trid(struct spdk_nvmf_listener *listener) +spdk_nvmf_subsystem_listener_get_trid(struct spdk_nvmf_subsystem_listener *listener) { return &listener->trid; }