The patch titled scsi: update max sdev block limit has been added to the -mm tree. Its filename is scsi-update-max-sdev-block-limit.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: scsi: update max sdev block limit From: James Smart <James.Smart@xxxxxxxxxx> 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. Signed-off-by: James Smart <James.Smart@xxxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/scsi/scsi_priv.h | 2 +- drivers/scsi/scsi_transport_fc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/scsi/scsi_priv.h~scsi-update-max-sdev-block-limit drivers/scsi/scsi_priv.h --- a/drivers/scsi/scsi_priv.h~scsi-update-max-sdev-block-limit +++ a/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 -puN drivers/scsi/scsi_transport_fc.c~scsi-update-max-sdev-block-limit drivers/scsi/scsi_transport_fc.c --- a/drivers/scsi/scsi_transport_fc.c~scsi-update-max-sdev-block-limit +++ a/drivers/scsi/scsi_transport_fc.c @@ -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, _ Patches currently in -mm which might be from James.Smart@xxxxxxxxxx are git-scsi-misc.patch fc-transport-bug-fix-correct-references.patch block-i-o-while-sg-reset-operation-in-progress-midlayer.patch block-i-o-while-sg-reset-operation-in-progress-lpfc.patch fc-transport-resolve-scan-vs-delete-deadlocks.patch scsi_target_reap-use-after-free-fix.patch scsi-update-max-sdev-block-limit.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html