Commit 50baa132 authored by GangCao's avatar GangCao Committed by Daniel Verkamp
Browse files

nvmf: move g_discovery_genctr variable under g_nvmf_tgt 



Change-Id: Id035a07d8ce49b89dc120be9d073ce46b488ce95
Signed-off-by: default avatarGangCao <gang.cao@intel.com>
parent 67027a9e

lib/nvmf/nvmf.c

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ spdk_nvmf_tgt_init(uint16_t max_queue_depth, uint16_t max_queues_per_sess, 
	g_nvmf_tgt.max_queue_depth = max_queue_depth;

	g_nvmf_tgt.in_capsule_data_size = in_capsule_data_size;

	g_nvmf_tgt.max_io_size = max_io_size;

	g_nvmf_tgt.discovery_genctr = 0;

	TAILQ_INIT(&g_nvmf_tgt.subsystems);



	SPDK_TRACELOG(SPDK_TRACE_NVMF, "Max Queues Per Session: %d\n", max_queues_per_sess);

lib/nvmf/nvmf_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ struct spdk_nvmf_tgt { 
	uint16_t				max_queues_per_session;

	uint32_t				in_capsule_data_size;

	uint32_t				max_io_size;

	uint64_t				discovery_genctr;

	TAILQ_HEAD(, spdk_nvmf_subsystem)	subsystems;

};

lib/nvmf/subsystem.c

+7 −8
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include "spdk_internal/bdev.h"

#include "spdk_internal/log.h"



static uint64_t g_discovery_genctr = 0;

static struct spdk_nvmf_discovery_log_page *g_discovery_log_page = NULL;

static size_t g_discovery_log_page_size = 0;
@@ -204,7 +203,7 @@ spdk_nvmf_create_subsystem(const char *nqn, 
	}



	TAILQ_INSERT_TAIL(&g_nvmf_tgt.subsystems, subsystem, entries);

	g_discovery_genctr++;

	g_nvmf_tgt.discovery_genctr++;



	return subsystem;

}
@@ -244,7 +243,7 @@ spdk_nvmf_delete_subsystem(struct spdk_nvmf_subsystem *subsystem) 
	}



	TAILQ_REMOVE(&g_nvmf_tgt.subsystems, subsystem, entries);

	g_discovery_genctr++;

	g_nvmf_tgt.discovery_genctr++;



	free(subsystem);

}
@@ -269,7 +268,7 @@ spdk_nvmf_subsystem_add_listener(struct spdk_nvmf_subsystem *subsystem, 


	TAILQ_INSERT_HEAD(&subsystem->listen_addrs, listen_addr, link);

	subsystem->num_listen_addrs++;

	g_discovery_genctr++;

	g_nvmf_tgt.discovery_genctr++;



	rc = transport->listen_addr_add(listen_addr);

	if (rc < 0) {
@@ -297,7 +296,7 @@ spdk_nvmf_subsystem_add_host(struct spdk_nvmf_subsystem *subsystem, const char * 


	TAILQ_INSERT_HEAD(&subsystem->hosts, host, link);

	subsystem->num_hosts++;

	g_discovery_genctr++;

	g_nvmf_tgt.discovery_genctr++;



	return 0;

}
@@ -329,7 +328,7 @@ nvmf_update_discovery_log(void) 
	size_t cur_size;



	SPDK_TRACELOG(SPDK_TRACE_NVMF, "Generating log page for genctr %" PRIu64 "\n",

		      g_discovery_genctr);

		      g_nvmf_tgt.discovery_genctr);



	cur_size = sizeof(struct spdk_nvmf_discovery_log_page);

	disc_log = calloc(1, cur_size);
@@ -373,7 +372,7 @@ nvmf_update_discovery_log(void) 
	}



	disc_log->numrec = numrec;

	disc_log->genctr = g_discovery_genctr;

	disc_log->genctr = g_nvmf_tgt.discovery_genctr;



	free(g_discovery_log_page);
@@ -388,7 +387,7 @@ spdk_nvmf_get_discovery_log_page(void *buffer, uint64_t offset, uint32_t length) 
	size_t zero_len = length;



	if (g_discovery_log_page == NULL ||

	    g_discovery_log_page->genctr != g_discovery_genctr) {

	    g_discovery_log_page->genctr != g_nvmf_tgt.discovery_genctr) {

		nvmf_update_discovery_log();

	}

test/lib/nvmf/subsystem/subsystem_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ test_discovery_log(void) 
	struct spdk_nvmf_discovery_log_page_entry *entry;



	/* Reset discovery-related globals */

	g_discovery_genctr = 0;

	g_nvmf_tgt.discovery_genctr = 0;

	free(g_discovery_log_page);

	g_discovery_log_page = NULL;

	g_discovery_log_page_size = 0;