android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: GKI: fix up merge issue in drivers/scsi/storvsc_drv.c

Browse Source 
In commit 22cf11e162 ("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: 22cf11e162 ("FROMGIT: scsi: core: Change the return type of .eh_timed_out()")
Change-Id: I8256ae9d6d308f6674e1bc6e5e2a29a03f8b6f3b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-09-18 11:42:41 +00:00
parent dbb69752f7
commit 82a49ac6c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/storvsc_drv.c
View File

@ -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)