Commit 63da8147 authored by Ben Walker's avatar Ben Walker
Browse files

nvmf: Remove nvmf_*_cmd.c files 



They each only had 1 function left that belonged
in the session.c file.

Change-Id: I405902b02e9316d2dc02d3732d8bc085c2b84d31
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent d7fbeda7

lib/nvmf/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) 


CFLAGS += $(DPDK_INC)

LIBNAME = nvmf

C_SRCS = nvmf_admin_cmd.c nvmf_io_cmd.c \

	 rdma.c port.c conn.c controller.c \

C_SRCS = rdma.c port.c conn.c controller.c \

	 host.c subsystem_grp.c conf.c \

	 nvmf.c request.c session.c

lib/nvmf/nvmf_admin_cmd.c

deleted100644 → 0
+0 −61
Original line number Diff line number Diff line 
/*-

 *   BSD LICENSE

 *

 *   Copyright (c) Intel Corporation.

 *   All rights reserved.

 *

 *   Redistribution and use in source and binary forms, with or without

 *   modification, are permitted provided that the following conditions

 *   are met:

 *

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in

 *       the documentation and/or other materials provided with the

 *       distribution.

 *     * Neither the name of Intel Corporation nor the names of its

 *       contributors may be used to endorse or promote products derived

 *       from this software without specific prior written permission.

 *

 *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include "nvmf.h"

#include "nvmf_internal.h"

#include "session.h"

#include "subsystem_grp.h"

#include "spdk/log.h"

#include "spdk/nvme.h"

#include "spdk/nvme_spec.h"

#include "spdk/pci.h"

#include "spdk/trace.h"



void

nvmf_check_admin_completions(struct nvmf_session *session)

{

	struct spdk_nvmf_subsystem *subsystem = session->subsys;

	struct spdk_nvme_ctrlr *ctrlr, *prev_ctrlr = NULL;

	int i;



	for (i = 0; i < MAX_PER_SUBSYSTEM_NAMESPACES; i++) {

		ctrlr = subsystem->ns_list_map[i].ctrlr;

		if (ctrlr == NULL)

			continue;

		if (ctrlr != NULL && ctrlr != prev_ctrlr) {

			spdk_nvme_ctrlr_process_admin_completions(ctrlr);

			prev_ctrlr = ctrlr;

		}

	}

}

lib/nvmf/nvmf_io_cmd.c

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
/*-

 *   BSD LICENSE

 *

 *   Copyright (c) Intel Corporation.

 *   All rights reserved.

 *

 *   Redistribution and use in source and binary forms, with or without

 *   modification, are permitted provided that the following conditions

 *   are met:

 *

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in

 *       the documentation and/or other materials provided with the

 *       distribution.

 *     * Neither the name of Intel Corporation nor the names of its

 *       contributors may be used to endorse or promote products derived

 *       from this software without specific prior written permission.

 *

 *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include "nvmf.h"

#include "nvmf_internal.h"

#include "request.h"

#include "session.h"

#include "subsystem_grp.h"

#include "spdk/log.h"

#include "spdk/nvme.h"

#include "spdk/nvme_spec.h"

#include "spdk/pci.h"

#include "spdk/trace.h"



void

nvmf_check_io_completions(struct nvmf_session *session)

{

	struct spdk_nvmf_subsystem *subsystem = session->subsys;

	struct spdk_nvme_qpair *qpair, *prev_qpair = NULL;

	int i;



	for (i = 0; i < MAX_PER_SUBSYSTEM_NAMESPACES; i++) {

		qpair = subsystem->ns_list_map[i].qpair;

		if (qpair == NULL)

			continue;

		if (qpair != NULL && qpair != prev_qpair) {

			spdk_nvme_qpair_process_completions(qpair, 0);

			prev_qpair = qpair;

		}

	}

}

lib/nvmf/session.c

+36 −0
Original line number Diff line number Diff line
@@ -503,3 +503,39 @@ nvmf_property_set(struct nvmf_session *session, 
		break;

	}

}



void

nvmf_check_admin_completions(struct nvmf_session *session)

{

	struct spdk_nvmf_subsystem *subsystem = session->subsys;

	struct spdk_nvme_ctrlr *ctrlr, *prev_ctrlr = NULL;

	int i;



	for (i = 0; i < MAX_PER_SUBSYSTEM_NAMESPACES; i++) {

		ctrlr = subsystem->ns_list_map[i].ctrlr;

		if (ctrlr == NULL)

			continue;

		if (ctrlr != NULL && ctrlr != prev_ctrlr) {

			spdk_nvme_ctrlr_process_admin_completions(ctrlr);

			prev_ctrlr = ctrlr;

		}

	}

}



void

nvmf_check_io_completions(struct nvmf_session *session)

{

	struct spdk_nvmf_subsystem *subsystem = session->subsys;

	struct spdk_nvme_qpair *qpair, *prev_qpair = NULL;

	int i;



	for (i = 0; i < MAX_PER_SUBSYSTEM_NAMESPACES; i++) {

		qpair = subsystem->ns_list_map[i].qpair;

		if (qpair == NULL)

			continue;

		if (qpair != NULL && qpair != prev_qpair) {

			spdk_nvme_qpair_process_completions(qpair, 0);

			prev_qpair = qpair;

		}

	}

}