aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorStephen M. Cameron <scameron@beardog.cce.hp.com>2014-02-18 14:55:22 -0500
committerJames Bottomley <JBottomley@Parallels.com>2014-03-15 13:19:03 -0400
commit2f6ae5cd24491647a011aead90d47523d875e443 (patch)
tree161ee78d7bf59d5411acc93603f23251e0dde626 /drivers
parente1f7de0cdd68d246d7008241cd9e443a54f880a8 (diff)
[SCSI] hpsa: only allow REQ_TYPE_FS to use fast path
When commands sent down the "fast path" fail, they must be re-tried down the normal RAID path. We do this by kicking i/o's back to the scsi mid layer with a DID_SOFT_ERROR status, which causes them to be retried. This won't work for SG_IO's and other non REQ_TYPE_FS i/o's which could get kicked all the way back to the application, which may have no idea that the command needs resubmitting and likely no way to resubmit it in such a way the that driver can recognize it as a resubmit and send it down the normal RAID path. So we just always send non REQ_TYPE_FS i/o's down the normal RAID path, never down the "fast path". Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/hpsa.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 4047c37aa4f8..6e97f05bd493 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -2330,7 +2330,8 @@ static int hpsa_scsi_queue_command_lck(struct scsi_cmnd *cmd,
2330 if ((likely(h->transMethod & CFGTBL_Trans_io_accel1)) && 2330 if ((likely(h->transMethod & CFGTBL_Trans_io_accel1)) &&
2331 (dev->ioaccel_handle) && 2331 (dev->ioaccel_handle) &&
2332 ((cmd->cmnd[0] == READ_10) || (cmd->cmnd[0] == WRITE_10)) && 2332 ((cmd->cmnd[0] == READ_10) || (cmd->cmnd[0] == WRITE_10)) &&
2333 (scsi_sg_count(cmd) <= IOACCEL1_MAXSGENTRIES)) 2333 (scsi_sg_count(cmd) <= IOACCEL1_MAXSGENTRIES) &&
2334 likely(cmd->request->cmd_type == REQ_TYPE_FS))
2334 return hpsa_scsi_ioaccel_queue_command(h, c); 2335 return hpsa_scsi_ioaccel_queue_command(h, c);
2335 2336
2336 c->Header.ReplyQueue = 0; /* unused in simple mode */ 2337 c->Header.ReplyQueue = 0; /* unused in simple mode */