Commit 29bfd55a authored Sep 29, 2017 by James Smart Committed by Martin K. Petersen Oct 02, 2017

scsi: lpfc: correct nvme sg segment count check



The internal cfg flag is actually smaller, by 1 (for a partial page
sge), than the sg list maintained by the driver. Thus the check on sg
segments errored out when it shouldn't have

Ensure the check is +1

Note: having a value that is less than what it really is is bogus.
Correcting it now would be a significant rework. Add this item to the
list to be refactored in the merge with efct.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 1abcb371

drivers/scsi/lpfc/lpfc_nvme.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1149,12 +1149,12 @@ lpfc_nvme_prep_io_dma(struct lpfc_vport *vport,

		first_data_sgl = sgl;
		lpfc_ncmd->seg_cnt = nCmd->sg_cnt;
		if (lpfc_ncmd->seg_cnt > phba->cfg_nvme_seg_cnt) {
		if (lpfc_ncmd->seg_cnt > phba->cfg_nvme_seg_cnt + 1) {
		lpfc_printf_log(phba, KERN_ERR, LOG_NVME_IOERR,
		"6058 Too many sg segments from "
		"NVME Transport. Max %d, "
		"nvmeIO sg_cnt %d\n",
		phba->cfg_nvme_seg_cnt,
		phba->cfg_nvme_seg_cnt + 1,
		lpfc_ncmd->seg_cnt);
		lpfc_ncmd->seg_cnt = 0;
		return 1;

Admin message