From 82a49ac6c80a5bce4d12088f4fa5379b233210cd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 18 Sep 2023 11:42:41 +0000 Subject: [PATCH] ANDROID: GKI: fix up merge issue in drivers/scsi/storvsc_drv.c In commit 22cf11e16270 ("FROMGIT: scsi: core: Change the return type of .eh_timed_out()") from upstream, the function signature changed which conflicted with other changes in LTS releases, where the merge ended up being incorrect. Fix this up by resolving the issue by hand. Fixes: 22cf11e16270 ("FROMGIT: scsi: core: Change the return type of .eh_timed_out()") Change-Id: I8256ae9d6d308f6674e1bc6e5e2a29a03f8b6f3b Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/storvsc_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index 7a1dc5c7c49e..11aa9813b8d1 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -1670,9 +1670,9 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd) * be unbounded on Azure. Reset the timer unconditionally to give the host a * chance to perform EH. */ -static enum blk_eh_timer_return storvsc_eh_timed_out(struct scsi_cmnd *scmnd) +static enum scsi_timeout_action storvsc_eh_timed_out(struct scsi_cmnd *scmnd) { - return BLK_EH_RESET_TIMER; + return SCSI_EH_RESET_TIMER; } static bool storvsc_scsi_cmd_ok(struct scsi_cmnd *scmnd)