aacraid: switch to block timeout

PATCH In review James Bottomley 1 participant 1 message Nov 30, 2008

Subsystems (2)

SCSI Aacraid SCSI RAID driver

lore

Share & tools

lore

James Bottomley

author maintainer

2008-11-30 16:15 UTC #0 lore raw

PATCH 1/7 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.

Signed-off-by James Bottomley <[email protected]>

Cc AACRAID list <[email protected]>

---

drivers/scsi/aacraid/linit.c +2 -2

index 1c5ac39..9f6f157 100644
@@ -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;