Commit c79d4eef authored by Jacek Kalwas's avatar Jacek Kalwas Committed by Tomasz Zawadzki
Browse files

nvmf: rename listener to subsystem listener 



Signed-off-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
Change-Id: I5c1e009114bdf8e8b59e0ca07fbae0900131a58e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/913


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent e2577e2a

include/spdk/nvmf.h

+6 −6
Original line number Diff line number Diff line
@@ -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.

lib/nvmf/ctrlr_discovery.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

lib/nvmf/nvmf.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

lib/nvmf/nvmf_internal.h

+11 −12
Original line number Diff line number Diff line
@@ -80,10 +80,10 @@ struct spdk_nvmf_host { 
	TAILQ_ENTRY(spdk_nvmf_host)	link;

};



struct spdk_nvmf_listener {

struct spdk_nvmf_subsystem_listener {

	struct spdk_nvme_transport_id			trid;

	struct spdk_nvmf_transport			*transport;

	TAILQ_ENTRY(spdk_nvmf_listener)	link;

	TAILQ_ENTRY(spdk_nvmf_subsystem_listener)	link;

};



/* Maximum number of registrants supported per namespace */
@@ -253,10 +253,8 @@ struct spdk_nvmf_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_subsystem_listener)	listeners;



	TAILQ_ENTRY(spdk_nvmf_subsystem)	entries;

};
@@ -317,7 +315,8 @@ 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,

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);

lib/nvmf/nvmf_rpc.c

+3 −3
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ 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_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);