* [PATCH 2/7] ibmvscsi: switch to block timeout
@ 2008-11-30 16:20 James Bottomley
0 siblings, 0 replies; only message in thread
From: James Bottomley @ 2008-11-30 16:20 UTC (permalink / raw)
To: linux-scsi; +Cc: Mike Anderson, Jens Axboe, Brian King
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>
---
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 87e09f3..6cad175 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -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);
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-11-30 16:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-30 16:20 [PATCH 2/7] ibmvscsi: switch to block timeout James Bottomley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox