Commit fc8455d1 authored by Li Lingfeng's avatar Li Lingfeng
Browse files

scsi: fix kabi broken 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAZLRK



--------------------------------

Commit 5ae17501("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: 5ae17501 ("scsi: core: Avoid leaving shost->last_reset with stale value if EH does not run")
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent a625b015

include/scsi/scsi_host.h

+2 −3
Original line number Diff line number Diff line
@@ -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)