Updated patch to address comments from Pat Mansfield and Michael Reed: Bumped max to 600 (10mins). Set default dev_loss_tmo to a value other than the max (30s). ---- Updated patch to address comments from Andreas Herrman, who noted that the initialization, with the HZ, was inconsistent with its use in the FC transport. -- This patch ups the maximum limit for how long an sdev is allowed to be blocked. Originally, the value was 60 seconds. However, we are aware of array failover and switch reboot times that can be as high as 90 seconds. We're proposing to change the max to 120 seconds. -- james s Signed-off-by: James Smart <James.Smart@xxxxxxxxxx> diff -upNr a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h --- a/drivers/scsi/scsi_priv.h 2006-05-10 11:36:25.000000000 -0400 +++ b/drivers/scsi/scsi_priv.h 2006-05-16 13:55:45.000000000 -0400 @@ -127,7 +127,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 -upNr a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c --- a/drivers/scsi/scsi_transport_fc.c 2006-05-11 10:31:54.000000000 -0400 +++ b/drivers/scsi/scsi_transport_fc.c 2006-05-16 13:57:55.000000000 -0400 @@ -368,7 +368,7 @@ static DECLARE_TRANSPORT_CLASS(fc_rport_ * 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, - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
