Commit 33b5627a authored by Niklas Cassel's avatar Niklas Cassel Committed by Tomasz Zawadzki
Browse files

nvme: only set check_sgl if sending in SGL type 



It does not make sense to send in check_sgl == true,
when we are calling _nvme_ns_cmd_rw() with a payload
of type NVME_PAYLOAD_CONTIG.

_nvme_ns_cmd_rw() simply cannot "check SGL" if the payload
is not a SGL. Doing so regardless just makes the code harder
to read.

We still send in check_sgl == true, when we are calling
_nvme_ns_cmd_rw() with a payload of type NVME_PAYLOAD_SGL.

Signed-off-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Change-Id: I56d49a2abf7819d20cf5974c9e0df8f04f1ccd10
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6009


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 88e3ffd7

lib/nvme/nvme_ns_cmd.c

+6 −6
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ spdk_nvme_ns_cmd_compare(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair, 
	req = _nvme_ns_cmd_rw(ns, qpair, &payload, 0, 0, lba, lba_count, cb_fn, cb_arg,

			      SPDK_NVME_OPC_COMPARE,

			      io_flags, 0,

			      0, true);

			      0, false);

	if (req != NULL) {

		return nvme_qpair_submit_request(qpair, req);

	} else if (nvme_ns_check_request_length(lba_count,
@@ -496,7 +496,7 @@ spdk_nvme_ns_cmd_compare_with_md(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair 
	req = _nvme_ns_cmd_rw(ns, qpair, &payload, 0, 0, lba, lba_count, cb_fn, cb_arg,

			      SPDK_NVME_OPC_COMPARE,

			      io_flags,

			      apptag_mask, apptag, true);

			      apptag_mask, apptag, false);

	if (req != NULL) {

		return nvme_qpair_submit_request(qpair, req);

	} else if (nvme_ns_check_request_length(lba_count,
@@ -596,7 +596,7 @@ spdk_nvme_ns_cmd_read(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair, vo 


	req = _nvme_ns_cmd_rw(ns, qpair, &payload, 0, 0, lba, lba_count, cb_fn, cb_arg, SPDK_NVME_OPC_READ,

			      io_flags, 0,

			      0, true);

			      0, false);

	if (req != NULL) {

		return nvme_qpair_submit_request(qpair, req);

	} else if (nvme_ns_check_request_length(lba_count,
@@ -627,7 +627,7 @@ spdk_nvme_ns_cmd_read_with_md(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *q 


	req = _nvme_ns_cmd_rw(ns, qpair, &payload, 0, 0, lba, lba_count, cb_fn, cb_arg, SPDK_NVME_OPC_READ,

			      io_flags,

			      apptag_mask, apptag, true);

			      apptag_mask, apptag, false);

	if (req != NULL) {

		return nvme_qpair_submit_request(qpair, req);

	} else if (nvme_ns_check_request_length(lba_count,
@@ -725,7 +725,7 @@ spdk_nvme_ns_cmd_write(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair *qpair, 
	payload = NVME_PAYLOAD_CONTIG(buffer, NULL);



	req = _nvme_ns_cmd_rw(ns, qpair, &payload, 0, 0, lba, lba_count, cb_fn, cb_arg, SPDK_NVME_OPC_WRITE,

			      io_flags, 0, 0, true);

			      io_flags, 0, 0, false);

	if (req != NULL) {

		return nvme_qpair_submit_request(qpair, req);

	} else if (nvme_ns_check_request_length(lba_count,
@@ -754,7 +754,7 @@ spdk_nvme_ns_cmd_write_with_md(struct spdk_nvme_ns *ns, struct spdk_nvme_qpair * 
	payload = NVME_PAYLOAD_CONTIG(buffer, metadata);



	req = _nvme_ns_cmd_rw(ns, qpair, &payload, 0, 0, lba, lba_count, cb_fn, cb_arg, SPDK_NVME_OPC_WRITE,

			      io_flags, apptag_mask, apptag, true);

			      io_flags, apptag_mask, apptag, false);

	if (req != NULL) {

		return nvme_qpair_submit_request(qpair, req);

	} else if (nvme_ns_check_request_length(lba_count,