diff options
| author | James Bottomley | 2016-06-18 11:59:01 -0700 |
|---|---|---|
| committer | James Bottomley | 2016-06-18 11:59:01 -0700 |
| commit | 951d77fd5a541d68eeb7372e72cd4757e3058517 (patch) | |
| tree | 74ddfe541cc01e61dbcaf946b604c01863637c65 /drivers/scsi | |
| parent | 27ea13e6186c1a5bd0fa2b0d6f854d60ca4ca4c9 (diff) | |
| parent | 8beb330044d0d1878c7b92290e91c0b889e92633 (diff) | |
Merge remote-tracking branch 'mkp-scsi/4.7/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/53c700.c | 4 | ||||
| -rw-r--r-- | drivers/scsi/scsi_error.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c index d4c285688ce9..3ddc85e6efd6 100644 --- a/drivers/scsi/53c700.c +++ b/drivers/scsi/53c700.c @@ -1122,7 +1122,7 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct scsi_cmnd *SCp, } else { struct scsi_cmnd *SCp; - SCp = scsi_host_find_tag(SDp->host, SCSI_NO_TAG); + SCp = SDp->current_cmnd; if(unlikely(SCp == NULL)) { sdev_printk(KERN_ERR, SDp, "no saved request for untagged cmd\n"); @@ -1826,7 +1826,7 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *) slot->tag, slot); } else { slot->tag = SCSI_NO_TAG; - /* must populate current_cmnd for scsi_host_find_tag to work */ + /* save current command for reselection */ SCp->device->current_cmnd = SCp; } /* sanity check: some of the commands generated by the mid-layer 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 |