Commit 1a27f108 authored by Ye Bin's avatar Ye Bin Committed by Yang Yingliang
Browse files

scsi: Fix kabi change due to add offline_already member in struct scsi_device 



hulk inclusion
category: bugfix
bugzilla: 34604
CVE: NA

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

Signed-off-by: default avatarYe Bin <yebin10@huawei.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent e6755376

drivers/scsi/scsi_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -1438,7 +1438,7 @@ scsi_prep_state_check(struct scsi_device *sdev, struct request *req) 
			 * before trying any recovery commands.

			 */

			if (!sdev->offline_already) {

				sdev->offline_already = true;

				sdev->offline_already = 1;

				sdev_printk(KERN_ERR, sdev,

					    "rejecting I/O to offline device\n");

			}
@@ -2859,7 +2859,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state) 
		break;



	}

	sdev->offline_already = false;

	sdev->offline_already = 0;

	sdev->sdev_state = state;

	return 0;

include/scsi/scsi_device.h

+4 −3
Original line number Diff line number Diff line
@@ -201,8 +201,6 @@ struct scsi_device { 
	unsigned lun_in_cdb:1;		/* Store LUN bits in CDB[1] */

	unsigned unmap_limit_for_ws:1;	/* Use the UNMAP limit for WRITE SAME */



	bool offline_already;		/* Device offline message logged */



	atomic_t disk_events_disable_depth; /* disable depth for disk events */



	DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */
@@ -230,8 +228,11 @@ struct scsi_device { 
	struct mutex		state_mutex;

	enum scsi_device_state sdev_state;

	struct task_struct	*quiesced_by;



#ifndef __GENKSYMS__

	unsigned long offline_already;	/* Device offline message logged */

#else

	KABI_RESERVE(1)

#endif

	KABI_RESERVE(2)

	KABI_RESERVE(3)

	KABI_RESERVE(4)