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

nvmf: move g_discovery_log_page_size variable under g_nvmf_tgt

Browse Source 
Change-Id: I87348063ea032a7a5415d07f98dca66bf572a958
Signed-off-by: GangCao <gang.cao@intel.com>
This commit is contained in:
GangCao 2017-02-17 10:01:34 +08:00 committed by Daniel Verkamp
parent 905b03786c
commit 4e4dc3999a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/nvmf/nvmf.c
View File

@ -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.in_capsule_data_size = in_capsule_data_size;
g_nvmf_tgt.max_io_size = max_io_size; g_nvmf_tgt.max_io_size = max_io_size;
g_nvmf_tgt.discovery_genctr = 0; 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 = 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 Queues Per Session: %d\n", max_queues_per_sess);
SPDK_TRACELOG(SPDK_TRACE_NVMF, "Max Queue Depth: %d\n", max_queue_depth); SPDK_TRACELOG(SPDK_TRACE_NVMF, "Max Queue Depth: %d\n", max_queue_depth);

1
lib/nvmf/nvmf_internal.h
View File

@ -54,6 +54,7 @@ struct spdk_nvmf_tgt {
uint64_t discovery_genctr; uint64_t discovery_genctr;
TAILQ_HEAD(, spdk_nvmf_subsystem) subsystems; TAILQ_HEAD(, spdk_nvmf_subsystem) subsystems;
struct spdk_nvmf_discovery_log_page *discovery_log_page; struct spdk_nvmf_discovery_log_page *discovery_log_page;
size_t discovery_log_page_size;
}; };
extern struct spdk_nvmf_tgt g_nvmf_tgt; extern struct spdk_nvmf_tgt g_nvmf_tgt;

8
lib/nvmf/subsystem.c
View File

@ -46,8 +46,6 @@
#include "spdk_internal/bdev.h" #include "spdk_internal/bdev.h"
#include "spdk_internal/log.h" #include "spdk_internal/log.h"
static size_t g_discovery_log_page_size = 0;
bool bool
spdk_nvmf_subsystem_exists(const char *subnqn) spdk_nvmf_subsystem_exists(const char *subnqn)
{ {
@ -376,7 +374,7 @@ nvmf_update_discovery_log(void)
free(g_nvmf_tgt.discovery_log_page); free(g_nvmf_tgt.discovery_log_page);
g_nvmf_tgt.discovery_log_page = disc_log; 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 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 */ /* Copy the valid part of the discovery log page, if any */
if (g_nvmf_tgt.discovery_log_page && offset < g_discovery_log_page_size) { if (g_nvmf_tgt.discovery_log_page && offset < g_nvmf_tgt.discovery_log_page_size) {
copy_len = spdk_min(g_discovery_log_page_size - offset, length); copy_len = spdk_min(g_nvmf_tgt.discovery_log_page_size - offset, length);
zero_len -= copy_len; zero_len -= copy_len;
memcpy(buffer, (char *)g_nvmf_tgt.discovery_log_page + offset, copy_len); memcpy(buffer, (char *)g_nvmf_tgt.discovery_log_page + offset, copy_len);
} }

2
test/lib/nvmf/subsystem/subsystem_ut.c
View File

@ -229,7 +229,7 @@ test_discovery_log(void)
g_nvmf_tgt.discovery_genctr = 0; g_nvmf_tgt.discovery_genctr = 0;
free(g_nvmf_tgt.discovery_log_page); free(g_nvmf_tgt.discovery_log_page);
g_nvmf_tgt.discovery_log_page = NULL; 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 */ /* 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, subsystem = spdk_nvmf_create_subsystem("nqn.2016-06.io.spdk:subsystem1", SPDK_NVMF_SUBTYPE_NVME,