projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
scsi_error.c
diff --git
a/drivers/scsi/scsi_error.c
b/drivers/scsi/scsi_error.c
index 984ddcb4786d6074c94a2b0387c25362a4f4c2c4..1b9c049bd5c550269083f6435e1547e13b78b5a2 100644
(file)
--- a/
drivers/scsi/scsi_error.c
+++ b/
drivers/scsi/scsi_error.c
@@
-1127,7
+1127,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)
{
*/
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);
}
scmd->eh_eflags = 0;
list_move_tail(&scmd->eh_entry, done_q);
}
@@
-2226,6
+2225,9
@@
int scsi_error_handler(void *data)
else
scsi_unjam_host(shost);
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
/*
* Note - if the above fails completely, the action is to take
* individual devices offline and flush the queue of any