hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAZLRK
--------------------------------
Commit 5ae17501bc62("scsi: core: Avoid leaving shost->last_reset with stale value if EH does not run") from mainline add eh_abort_list to struct Scsi_Host which results in kabi broken. Fix it by using KABI_USE.
Fixes: 5ae17501bc62 ("scsi: core: Avoid leaving shost->last_reset with stale value if EH does not run") Signed-off-by: Li Lingfeng lilingfeng3@huawei.com --- include/scsi/scsi_host.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 5bb97f9a9f51..3a3cc3fe9a87 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -546,7 +546,6 @@ struct Scsi_Host {
struct mutex scan_mutex;/* serialize scanning activity */
- struct list_head eh_abort_list; struct list_head eh_cmd_q; struct task_struct * ehandler; /* Error recovery thread. */ struct completion * eh_action; /* Wait for specific actions on the @@ -700,8 +699,8 @@ struct Scsi_Host { struct device *dma_dev;
KABI_USE(1, bool is_builtin) - KABI_RESERVE(2) - KABI_RESERVE(3) + KABI_REPLACE(_KABI_RESERVE(2); _KABI_RESERVE(3), + struct list_head eh_abort_list) KABI_RESERVE(4) KABI_RESERVE(5) KABI_RESERVE(6)