[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>

parent 97b5648a

drivers/scsi/megaraid/megaraid_sas.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}