diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-11-30 10:15:37 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-01 11:15:16 -0600 |
| commit | 8fbd64e2eeb81d4b94be935a15d6d4829ec62aa2 (patch) | |
| tree | 38ac9263a03848b9cf94b6b256c4a74875d687fd /drivers/scsi/aacraid | |
| parent | f7a65e92e4bef3ccf9e008ed8cd52d914b6a4adb (diff) | |
[SCSI] aacraid: switch to block timeout
aacraid updates the timeout in its slave configure routine if it is too
small. This now needs to update the request queue timeout in block.
Cc: AACRAID list <aacraid@adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/aacraid')
| -rw-r--r-- | drivers/scsi/aacraid/linit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 9aa301c1ed0..162cd927d94 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -427,8 +427,8 @@ static int aac_slave_configure(struct scsi_device *sdev) * Firmware has an individual device recovery time typically * of 35 seconds, give us a margin. */ - if (sdev->timeout < (45 * HZ)) - sdev->timeout = 45 * HZ; + if (sdev->request_queue->rq_timeout < (45 * HZ)) + blk_queue_rq_timeout(sdev->request_queue, 45*HZ); for (cid = 0; cid < aac->maximum_num_containers; ++cid) if (aac->fsa_dev[cid].valid) ++num_lsu; |