Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fbd64e2 authored by James Bottomley's avatar James Bottomley
Browse files

[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: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent f7a65e92

drivers/scsi/aacraid/linit.c

+2 −2
Original line number Diff line number Diff line
@@ -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;