diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-11-30 10:27:51 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-01 11:15:55 -0600 |
| commit | ee1ab9e945803a607ba5c2a96b69e4820a806552 (patch) | |
| tree | 80d14de63223865e29fb197c2ea85ecffd516e6f /drivers/scsi | |
| parent | 97b5648a8bc2aef980645ee39d31bba0933a6112 (diff) | |
| download | linux-stable-ee1ab9e945803a607ba5c2a96b69e4820a806552.tar.gz linux-stable-ee1ab9e945803a607ba5c2a96b69e4820a806552.tar.bz2 linux-stable-ee1ab9e945803a607ba5c2a96b69e4820a806552.zip | |
[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>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index a454f94623d7..17ce7abe17ee 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; } |