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

nvmf: replace RTE_VERIFY with assert in request.c

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

Change-Id: Ic6932a16d0a36cd1a3cb25c8cc5e295c59f3e2db
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-07-21 17:02:41 -07:00 committed by Benjamin Walker
parent 163127a65e
commit 1f929aa55c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/nvmf/request.c
View File

@ -31,8 +31,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <rte_config.h> #include <assert.h>
#include <rte_debug.h>
#include "nvmf_internal.h" #include "nvmf_internal.h"
#include "request.h" #include "request.h"
@ -560,11 +559,11 @@ spdk_nvmf_request_prep_data(struct spdk_nvmf_request *req,
if (xfer == SPDK_NVME_DATA_NONE) { if (xfer == SPDK_NVME_DATA_NONE) {
SPDK_TRACELOG(SPDK_TRACE_NVMF, "No data to transfer\n"); SPDK_TRACELOG(SPDK_TRACE_NVMF, "No data to transfer\n");
RTE_VERIFY(req->data == NULL); assert(req->data == NULL);
RTE_VERIFY(req->length == 0); assert(req->length == 0);
} else { } else {
RTE_VERIFY(req->data != NULL); assert(req->data != NULL);
RTE_VERIFY(req->length != 0); assert(req->length != 0);
SPDK_TRACELOG(SPDK_TRACE_NVMF, "%s data ready\n", SPDK_TRACELOG(SPDK_TRACE_NVMF, "%s data ready\n",
xfer == SPDK_NVME_DATA_HOST_TO_CONTROLLER ? "Host to Controller" : xfer == SPDK_NVME_DATA_HOST_TO_CONTROLLER ? "Host to Controller" :
"Controller to Host"); "Controller to Host");
@ -592,7 +591,7 @@ spdk_nvmf_request_exec(struct spdk_nvmf_request *req)
struct spdk_nvmf_subsystem *subsystem; struct spdk_nvmf_subsystem *subsystem;
subsystem = session->subsys; subsystem = session->subsys;
RTE_VERIFY(subsystem != NULL); assert(subsystem != NULL);
if (subsystem->subtype == SPDK_NVMF_SUBTYPE_DISCOVERY) { if (subsystem->subtype == SPDK_NVMF_SUBTYPE_DISCOVERY) {
done = nvmf_process_discovery_cmd(req); done = nvmf_process_discovery_cmd(req);
} else { } else {