Andrew Lukoshko
b9d46fff46
Add the RHEL 211.17.1..211.18.1 backports (1162-1244) from centos-stream-10 and upstream, on top of 211.16.1. Includes the lpfc 14.4.0.x revert batch and the RHEL-only lpfc_nlp_get UAF guard. Bump to 211.18.1.
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
Subject: [PATCH] Revert "scsi: lpfc: use min() to improve code"
|
|
# reverse of cs10 e891063a53bdd334d714e6769e385508722ceef6
|
|
|
|
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
|
|
index 0555b85ba9e7..29503ceb8e7a 100644
|
|
--- a/drivers/scsi/lpfc/lpfc_init.c
|
|
+++ b/drivers/scsi/lpfc/lpfc_init.c
|
|
@@ -8300,7 +8300,10 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
|
|
phba->cfg_total_seg_cnt, phba->cfg_scsi_seg_cnt,
|
|
phba->cfg_nvme_seg_cnt);
|
|
|
|
- i = min(phba->cfg_sg_dma_buf_size, SLI4_PAGE_SIZE);
|
|
+ if (phba->cfg_sg_dma_buf_size < SLI4_PAGE_SIZE)
|
|
+ i = phba->cfg_sg_dma_buf_size;
|
|
+ else
|
|
+ i = SLI4_PAGE_SIZE;
|
|
|
|
phba->lpfc_sg_dma_buf_pool =
|
|
dma_pool_create("lpfc_sg_dma_buf_pool",
|
|
diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
|
|
index 2dd148fd3ea1..1d7488b9e7b9 100644
|
|
--- a/drivers/scsi/lpfc/lpfc_nvme.c
|
|
+++ b/drivers/scsi/lpfc/lpfc_nvme.c
|
|
@@ -1234,8 +1234,12 @@ lpfc_nvme_prep_io_cmd(struct lpfc_vport *vport,
|
|
if ((phba->cfg_nvme_enable_fb) &&
|
|
test_bit(NLP_FIRSTBURST, &pnode->nlp_flag)) {
|
|
req_len = lpfc_ncmd->nvmeCmd->payload_length;
|
|
- wqe->fcp_iwrite.initial_xfer_len = min(req_len,
|
|
- pnode->nvme_fb_size);
|
|
+ if (req_len < pnode->nvme_fb_size)
|
|
+ wqe->fcp_iwrite.initial_xfer_len =
|
|
+ req_len;
|
|
+ else
|
|
+ wqe->fcp_iwrite.initial_xfer_len =
|
|
+ pnode->nvme_fb_size;
|
|
} else {
|
|
wqe->fcp_iwrite.initial_xfer_len = 0;
|
|
}
|