From: Hannes Reinecke Date: Wed, 23 Oct 2013 08:51:16 +0000 (+0200) Subject: [SCSI] dpt_i2o: return SCSI_MLQUEUE_HOST_BUSY when in reset X-Git-Tag: v3.13-rc1~99^2~7 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63d80c49baa956d871136d8d4afb7900eb4a6cc9;p=pandora-kernel.git [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 Signed-off-by: James Bottomley --- 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