Commit 6e415c44 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvmf: drop global nvme_request_pool 



It is just a duplicate of the NVMe library request_mempool.

Change-Id: I2a5484e5d515b965503b2cfcd8d85ccfcb0dee05
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent dcc055e3

lib/nvmf/nvmf.c

+9 −10
Original line number Diff line number Diff line
@@ -87,18 +87,17 @@ spdk_nvmf_initialize_pools(struct spdk_nvmf_globals *spdk_nvmf) 
	SPDK_NOTICELOG("\n*** NVMf Pool Creation ***\n");



	/* create NVMe backend request pool */

	spdk_nvmf->nvme_request_pool = rte_mempool_create("NVMe_Pool",

	request_mempool = rte_mempool_create("NVMe_Pool",

					     SPDK_NVMF_DESC_POOL_SIZE(spdk_nvmf),

					     spdk_nvme_request_size(),

					     128, 0,

					     NULL, NULL, NULL, NULL,

					     SOCKET_ID_ANY, 0);

	if (!spdk_nvmf->nvme_request_pool) {

	if (!request_mempool) {

		SPDK_ERRLOG("create NVMe request pool failed\n");

		return -1;

	}

	/* set global pointer for this pool referenced by libraries */

	request_mempool = spdk_nvmf->nvme_request_pool;



	SPDK_TRACELOG(SPDK_TRACE_DEBUG, "NVMe request_mempool %p, size 0x%u bytes\n",

		      request_mempool,

		      (unsigned int)(SPDK_NVMF_DESC_POOL_SIZE(spdk_nvmf) * spdk_nvme_request_size()));
@@ -123,7 +122,7 @@ spdk_nvmf_check_pools(void) 
	struct spdk_nvmf_globals *spdk_nvmf = &g_nvmf_tgt;

	int rc = 0;



	rc += spdk_nvmf_check_pool(spdk_nvmf->nvme_request_pool, SPDK_NVMF_DESC_POOL_SIZE(spdk_nvmf));

	rc += spdk_nvmf_check_pool(request_mempool, SPDK_NVMF_DESC_POOL_SIZE(spdk_nvmf));



	if (rc == 0) {

		return 0;

lib/nvmf/nvmf_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ struct spdk_nvmf_globals { 
	int MaxQueueDepth;

	int MaxConnectionsPerSession;



	struct rte_mempool *nvme_request_pool;

	uint16_t	   sin_port;

};