diff options
| author | Hannes Reinecke <hare@suse.de> | 2013-10-23 10:51:16 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-10-25 11:40:42 +0100 |
| commit | 63d80c49baa956d871136d8d4afb7900eb4a6cc9 (patch) | |
| tree | 957e7cdf5df78b74a02997c13032eb7ea047f47d /drivers/scsi | |
| parent | 1f8c88c3b52ffd424ca76f80d1ed78639c532aef (diff) | |
| download | linux-63d80c49baa956d871136d8d4afb7900eb4a6cc9.tar.gz linux-63d80c49baa956d871136d8d4afb7900eb4a6cc9.tar.bz2 linux-63d80c49baa956d871136d8d4afb7900eb4a6cc9.zip | |
[SCSI] dpt_i2o: return SCSI_MLQUEUE_HOST_BUSY when in reset
When the HBA is in reset we should be returning 'busy' and not
rely on the obscure 'last_reset' feature.
[jejb: checkpatch fixes]
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/dpt_i2o.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index d13517dd0c19..c0ae8fa57a3b 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c @@ -448,11 +448,8 @@ static int adpt_queue_lck(struct scsi_cmnd * cmd, void (*done) (struct scsi_cmnd } rmb(); - if ((pHba->state) & DPTI_STATE_RESET) { - pHba->host->last_reset = jiffies; - pHba->host->resetting = 1; - return 1; - } + if ((pHba->state) & DPTI_STATE_RESET) + return SCSI_MLQUEUE_HOST_BUSY; // TODO if the cmd->device if offline then I may need to issue a bus rescan // followed by a get_lct to see if the device is there anymore |