ibmvscsi: switch to block timeout

PATCH In review James Bottomley 1 participant 1 message Nov 30, 2008

Subsystems (3)

SCSI PowerPC IBM Power Virtual SCSI Device Drivers

lore

Share & tools

lore

James Bottomley

author maintainer

2008-11-30 16:20 UTC #0 lore raw

PATCH 2/7 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 <[email protected]>

Signed-off-by James Bottomley <[email protected]>

---

drivers/scsi/ibmvscsi/ibmvscsi.c +1 -1

index 87e09f3..6cad175 100644
@@ -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);