Commit 1f929aa5 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Benjamin Walker
Browse files

nvmf: replace RTE_VERIFY with assert in request.c 



No reason to use DPDK in this file just for an equivalent to assert().

Change-Id: Ic6932a16d0a36cd1a3cb25c8cc5e295c59f3e2db
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 163127a6

lib/nvmf/request.c

+6 −7
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ 
 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include <rte_config.h>

#include <rte_debug.h>

#include <assert.h>



#include "nvmf_internal.h"

#include "request.h"
@@ -560,11 +559,11 @@ spdk_nvmf_request_prep_data(struct spdk_nvmf_request *req, 


	if (xfer == SPDK_NVME_DATA_NONE) {

		SPDK_TRACELOG(SPDK_TRACE_NVMF, "No data to transfer\n");

		RTE_VERIFY(req->data == NULL);

		RTE_VERIFY(req->length == 0);

		assert(req->data == NULL);

		assert(req->length == 0);

	} else {

		RTE_VERIFY(req->data != NULL);

		RTE_VERIFY(req->length != 0);

		assert(req->data != NULL);

		assert(req->length != 0);

		SPDK_TRACELOG(SPDK_TRACE_NVMF, "%s data ready\n",

			      xfer == SPDK_NVME_DATA_HOST_TO_CONTROLLER ? "Host to Controller" :

			      "Controller to Host");
@@ -592,7 +591,7 @@ spdk_nvmf_request_exec(struct spdk_nvmf_request *req) 
		struct spdk_nvmf_subsystem *subsystem;



		subsystem = session->subsys;

		RTE_VERIFY(subsystem != NULL);

		assert(subsystem != NULL);

		if (subsystem->subtype == SPDK_NVMF_SUBTYPE_DISCOVERY) {

			done = nvmf_process_discovery_cmd(req);

		} else {