summaryrefslogtreecommitdiff
path: root/drivers/scsi/scsi_error.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2016-06-18 21:59:01 +0300
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2016-06-18 21:59:01 +0300
commit951d77fd5a541d68eeb7372e72cd4757e3058517 (patch)
tree74ddfe541cc01e61dbcaf946b604c01863637c65 /drivers/scsi/scsi_error.c
parent27ea13e6186c1a5bd0fa2b0d6f854d60ca4ca4c9 (diff)
parent8beb330044d0d1878c7b92290e91c0b889e92633 (diff)
downloadlinux-951d77fd5a541d68eeb7372e72cd4757e3058517.tar.xz
Merge remote-tracking branch 'mkp-scsi/4.7/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi/scsi_error.c')
-rw-r--r--drivers/scsi/scsi_error.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index a8b610eaa0ca..106a6adbd6f1 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1128,7 +1128,6 @@ static int scsi_eh_action(struct scsi_cmnd *scmd, int rtn)
*/
void scsi_eh_finish_cmd(struct scsi_cmnd *scmd, struct list_head *done_q)
{
- scmd->device->host->host_failed--;
scmd->eh_eflags = 0;
list_move_tail(&scmd->eh_entry, done_q);
}
@@ -2227,6 +2226,9 @@ int scsi_error_handler(void *data)
else
scsi_unjam_host(shost);
+ /* All scmds have been handled */
+ shost->host_failed = 0;
+
/*
* Note - if the above fails completely, the action is to take
* individual devices offline and flush the queue of any