[SCSI] ibmvscsi: switch to block timeout

ibmvscsi sets the timeout in its slave configure routine for disk
devices. This now needs to update the request queue timeout in block.

Cc: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 8fbd64e2

drivers/scsi/ibmvscsi/ibmvscsi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1442,7 +1442,7 @@ static int ibmvscsi_slave_configure(struct scsi_device *sdev)
		spin_lock_irqsave(shost->host_lock, lock_flags);
		if (sdev->type == TYPE_DISK) {
		sdev->allow_restart = 1;
		sdev->timeout = 60 * HZ;
		blk_queue_rq_timeout(sdev->request_queue, 60 * HZ);
		}
		scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun);
		spin_unlock_irqrestore(shost->host_lock, lock_flags);