Andrew Lukoshko
5c58271075
Drop the 687.5.3/687.5.4 security-ahead patches superseded by the RHEL 687.6.1..687.10.1 backports (1100-1104), and add those backports (1100-1196) sourced from centos-stream-9 and upstream stable. Keep the AlmaLinux-ahead smb cifs.spnego fix (retained as 1197). Bump to 5.14.0-687.10.1.
57 lines
1.9 KiB
Diff
57 lines
1.9 KiB
Diff
From: AlmaLinux backport
|
|
Subject: [PATCH] Revert "scsi: lpfc: Update debugfs trace ring initialization messages"
|
|
# Revert of 580bc25e722ca698094ef3e4aa1ac7152ed0e071
|
|
scsi: lpfc: Update debugfs trace ring initialization messages
|
|
|
|
|
|
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
|
|
index 1b6cdadc7426..e5a31bc0f6c9 100644
|
|
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
|
|
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
|
|
@@ -6227,9 +6227,8 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
|
|
i++;
|
|
}
|
|
lpfc_debugfs_max_slow_ring_trc = (1 << i);
|
|
- pr_info("lpfc_debugfs_max_slow_ring_trc "
|
|
- "changed to %d\n",
|
|
- lpfc_debugfs_max_slow_ring_trc);
|
|
+ pr_err("lpfc_debugfs_max_disc_trc changed to "
|
|
+ "%d\n", lpfc_debugfs_max_disc_trc);
|
|
}
|
|
}
|
|
|
|
@@ -6261,7 +6260,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
|
|
atomic_set(&phba->nvmeio_trc_cnt, 0);
|
|
if (lpfc_debugfs_max_nvmeio_trc) {
|
|
num = lpfc_debugfs_max_nvmeio_trc - 1;
|
|
- if (num & lpfc_debugfs_max_nvmeio_trc) {
|
|
+ if (num & lpfc_debugfs_max_disc_trc) {
|
|
/* Change to be a power of 2 */
|
|
num = lpfc_debugfs_max_nvmeio_trc;
|
|
i = 0;
|
|
@@ -6270,9 +6269,10 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
|
|
i++;
|
|
}
|
|
lpfc_debugfs_max_nvmeio_trc = (1 << i);
|
|
- pr_info("lpfc_debugfs_max_nvmeio_trc changed "
|
|
- "to %d\n",
|
|
- lpfc_debugfs_max_nvmeio_trc);
|
|
+ lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
|
|
+ "0575 lpfc_debugfs_max_nvmeio_trc "
|
|
+ "changed to %d\n",
|
|
+ lpfc_debugfs_max_nvmeio_trc);
|
|
}
|
|
phba->nvmeio_trc_size = lpfc_debugfs_max_nvmeio_trc;
|
|
|
|
@@ -6317,8 +6317,8 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
|
|
i++;
|
|
}
|
|
lpfc_debugfs_max_disc_trc = (1 << i);
|
|
- pr_info("lpfc_debugfs_max_disc_trc changed to %d\n",
|
|
- lpfc_debugfs_max_disc_trc);
|
|
+ pr_err("lpfc_debugfs_max_disc_trc changed to %d\n",
|
|
+ lpfc_debugfs_max_disc_trc);
|
|
}
|
|
}
|
|
|