From e1d693ebe57024c7d4855fe8a63e45b273d845c3 Mon Sep 17 00:00:00 2001 From: James Smart Date: Tue, 16 May 2006 16:13:36 -0400 Subject: [PATCH] --- yaml --- r: 31910 b: refs/heads/master c: 1c9e16e47a22c61d99aabb1c154e5106ddbf3575 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_priv.h | 2 +- trunk/drivers/scsi/scsi_transport_fc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8c2b0f70115d..aa86b8fb3afb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0785edff7b316cad566bdc369d3d034c4c1a39c +refs/heads/master: 1c9e16e47a22c61d99aabb1c154e5106ddbf3575 diff --git a/trunk/drivers/scsi/scsi_priv.h b/trunk/drivers/scsi/scsi_priv.h index a1727a0e1bdd..117c2336f333 100644 --- a/trunk/drivers/scsi/scsi_priv.h +++ b/trunk/drivers/scsi/scsi_priv.h @@ -117,7 +117,7 @@ extern struct bus_type scsi_bus_type; * classes. */ -#define SCSI_DEVICE_BLOCK_MAX_TIMEOUT (HZ*60) +#define SCSI_DEVICE_BLOCK_MAX_TIMEOUT 600 /* units in seconds */ extern int scsi_internal_device_block(struct scsi_device *sdev); extern int scsi_internal_device_unblock(struct scsi_device *sdev); diff --git a/trunk/drivers/scsi/scsi_transport_fc.c b/trunk/drivers/scsi/scsi_transport_fc.c index c76e73a3ffbe..df6263dfd791 100644 --- a/trunk/drivers/scsi/scsi_transport_fc.c +++ b/trunk/drivers/scsi/scsi_transport_fc.c @@ -368,7 +368,7 @@ static DECLARE_TRANSPORT_CLASS(fc_rport_class, * should insulate the loss of a remote port. * The maximum will be capped by the value of SCSI_DEVICE_BLOCK_MAX_TIMEOUT. */ -static unsigned int fc_dev_loss_tmo = SCSI_DEVICE_BLOCK_MAX_TIMEOUT; +static unsigned int fc_dev_loss_tmo = 60; /* seconds */ module_param_named(dev_loss_tmo, fc_dev_loss_tmo, int, S_IRUGO|S_IWUSR); MODULE_PARM_DESC(dev_loss_tmo,