Skip to contentSkip to conversation

megaraid_sas: switch to block timeout

PATCH In review James Bottomley 2 participants 2 messages Nov 30, 2008 – Dec 2, 2008

Subsystems (2)
SCSI Megaraid SCSI/SAS drivers
lore
Share & tools
lore

James Bottomley

author maintainer
#0 lore raw

PATCH 3/7 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" <[email protected]>
Signed-off-by James Bottomley <[email protected]>

---

drivers/scsi/megaraid/megaraid_sas.c +2 -1
index a454f94..17ce7ab 100644
@@ -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;
 }
#1 lore raw

ACK.

-----Original Message-----
From: James Bottomley [mailto:[email protected]]
Sent: Sunday, November 30, 2008 11:28 AM
To: linux-scsi
Cc: Mike Anderson; Jens Axboe; Yang, Bo
Subject: [PATCH 3/7] 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" <[email protected]>
Signed-off-by James Bottomley <[email protected]>

---

drivers/scsi/megaraid/megaraid_sas.c +2 -1
index a454f94..17ce7ab 100644
@@ -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;
 }