* [PATCH 1/7] aacraid: switch to block timeout
@ 2008-11-30 16:15 James Bottomley
0 siblings, 0 replies; only message in thread
From: James Bottomley @ 2008-11-30 16:15 UTC (permalink / raw)
To: linux-scsi; +Cc: Mike Anderson, Jens Axboe, aacraid
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.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: AACRAID list <aacraid@adaptec.com>
---
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 1c5ac39..9f6f157 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;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-11-30 16:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-30 16:15 [PATCH 1/7] aacraid: switch to block timeout James Bottomley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox