summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2008-11-30 10:27:51 -0600
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-12-01 11:15:55 -0600
commitee1ab9e945803a607ba5c2a96b69e4820a806552 (patch)
tree80d14de63223865e29fb197c2ea85ecffd516e6f
parent97b5648a8bc2aef980645ee39d31bba0933a6112 (diff)
downloadop-kernel-dev-ee1ab9e945803a607ba5c2a96b69e4820a806552.zip
op-kernel-dev-ee1ab9e945803a607ba5c2a96b69e4820a806552.tar.gz
[SCSI] megaraid_sas: switch to block timeout
megaraid_sas sets the timeout in its slave configure routine for devices on special channels. This now needs to update the request queue timeout in block. Cc: "Yang, Bo" <Bo.Yang@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/scsi/megaraid/megaraid_sas.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index a454f94..17ce7ab 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -1016,7 +1016,8 @@ static int megasas_slave_configure(struct scsi_device *sdev)
* The RAID firmware may require extended timeouts.
*/
if (sdev->channel >= MEGASAS_MAX_PD_CHANNELS)
- sdev->timeout = MEGASAS_DEFAULT_CMD_TIMEOUT * HZ;
+ blk_queue_rq_timeout(sdev->request_queue,
+ MEGASAS_DEFAULT_CMD_TIMEOUT * HZ);
return 0;
}
OpenPOWER on IntegriCloud