Commit 4e4dc399 authored by GangCao's avatar GangCao Committed by Daniel Verkamp
Browse files

nvmf: move g_discovery_log_page_size variable under g_nvmf_tgt 



Change-Id: I87348063ea032a7a5415d07f98dca66bf572a958
Signed-off-by: default avatarGangCao <gang.cao@intel.com>
parent 905b0378

lib/nvmf/nvmf.c

+2 −1
Original line number Diff line number Diff line
@@ -59,8 +59,9 @@ spdk_nvmf_tgt_init(uint16_t max_queue_depth, uint16_t max_queues_per_sess, 
	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);

	g_nvmf_tgt.discovery_log_page = NULL;

	g_nvmf_tgt.discovery_log_page_size = 0;

	TAILQ_INIT(&g_nvmf_tgt.subsystems);



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

	SPDK_TRACELOG(SPDK_TRACE_NVMF, "Max Queue Depth: %d\n", max_queue_depth);

lib/nvmf/nvmf_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ struct spdk_nvmf_tgt { 
	uint64_t				discovery_genctr;

	TAILQ_HEAD(, spdk_nvmf_subsystem)	subsystems;

	struct spdk_nvmf_discovery_log_page	*discovery_log_page;

	size_t					discovery_log_page_size;

};



extern struct spdk_nvmf_tgt g_nvmf_tgt;

lib/nvmf/subsystem.c

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

#include "spdk_internal/log.h"



static size_t g_discovery_log_page_size = 0;



bool

spdk_nvmf_subsystem_exists(const char *subnqn)

{
@@ -376,7 +374,7 @@ nvmf_update_discovery_log(void) 
	free(g_nvmf_tgt.discovery_log_page);



	g_nvmf_tgt.discovery_log_page = disc_log;

	g_discovery_log_page_size = cur_size;

	g_nvmf_tgt.discovery_log_page_size = cur_size;

}



void
@@ -391,8 +389,8 @@ spdk_nvmf_get_discovery_log_page(void *buffer, uint64_t offset, uint32_t length) 
	}



	/* Copy the valid part of the discovery log page, if any */

	if (g_nvmf_tgt.discovery_log_page && offset < g_discovery_log_page_size) {

		copy_len = spdk_min(g_discovery_log_page_size - offset, length);

	if (g_nvmf_tgt.discovery_log_page && offset < g_nvmf_tgt.discovery_log_page_size) {

		copy_len = spdk_min(g_nvmf_tgt.discovery_log_page_size - offset, length);

		zero_len -= copy_len;

		memcpy(buffer, (char *)g_nvmf_tgt.discovery_log_page + offset, copy_len);

	}

test/lib/nvmf/subsystem/subsystem_ut.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ test_discovery_log(void) 
	g_nvmf_tgt.discovery_genctr = 0;

	free(g_nvmf_tgt.discovery_log_page);

	g_nvmf_tgt.discovery_log_page = NULL;

	g_discovery_log_page_size = 0;

	g_nvmf_tgt.discovery_log_page_size = 0;



	/* Add one subsystem and verify that the discovery log contains it */

	subsystem = spdk_nvmf_create_subsystem("nqn.2016-06.io.spdk:subsystem1", SPDK_NVMF_SUBTYPE_NVME,