aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ibmvscsi
diff options
context:
space:
mode:
authorBrian King <brking@linux.vnet.ibm.com>2007-10-25 17:06:34 -0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-01-11 19:22:31 -0500
commitd1a357fcc8348d325d151f6fe0ea54e317652457 (patch)
treea0ae3559d1877a99248e5e22fda0d097b6b7c3c0 /drivers/scsi/ibmvscsi
parentf37a7238d379bc2befbcb08a03de03f4f446131c (diff)
[SCSI] ibmvscsi: Set default command timeout
Set the default command timeout for ibmvscsi disks to 60 seconds to ensure we don't prematurely timeout commands. This fixes a problem seen where the default 30 seconds was not long enough due to congestion on the server. Signed-off-by: Brian King <brking@linux.vnet.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/ibmvscsi')
-rw-r--r--drivers/scsi/ibmvscsi/ibmvscsi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 5f2396c03958..50120c8c164b 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -1386,8 +1386,10 @@ static int ibmvscsi_slave_configure(struct scsi_device *sdev)
1386 unsigned long lock_flags = 0; 1386 unsigned long lock_flags = 0;
1387 1387
1388 spin_lock_irqsave(shost->host_lock, lock_flags); 1388 spin_lock_irqsave(shost->host_lock, lock_flags);
1389 if (sdev->type == TYPE_DISK) 1389 if (sdev->type == TYPE_DISK) {
1390 sdev->allow_restart = 1; 1390 sdev->allow_restart = 1;
1391 sdev->timeout = 60 * HZ;
1392 }
1391 scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun); 1393 scsi_adjust_queue_depth(sdev, 0, shost->cmd_per_lun);
1392 spin_unlock_irqrestore(shost->host_lock, lock_flags); 1394 spin_unlock_irqrestore(shost->host_lock, lock_flags);
1393 return 0; 1395 return 0;