On Thu, 2013-12-12 at 12:08 +0100, Hannes Reinecke wrote:
> When the host template doesn't declare an eh_host_reset_handler
> the eh_deadline mechanism is pointless and will set the
> device to offline. So disable eh_deadline if no
> eh_host_reset_handler is present.
>
> Cc: Ewan Milne <emilne@xxxxxxxxxx>
> Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
> ---
> drivers/scsi/hosts.c | 2 +-
> drivers/scsi/scsi_sysfs.c | 4 +++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
> index 6966def..351afa4 100644
> --- a/drivers/scsi/hosts.c
> +++ b/drivers/scsi/hosts.c
> @@ -396,7 +396,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
> shost->unchecked_isa_dma = sht->unchecked_isa_dma;
> shost->use_clustering = sht->use_clustering;
> shost->ordered_tag = sht->ordered_tag;
> - if (shost_eh_deadline == -1)
> + if (shost_eh_deadline == -1 || !sht->eh_host_reset_handler)
> shost->eh_deadline = -1;
> else if ((ulong) shost_eh_deadline * HZ > INT_MAX) {
> shost_printk(KERN_WARNING, shost,
> diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
> index 9117d0b..7434e26 100644
> --- a/drivers/scsi/scsi_sysfs.c
> +++ b/drivers/scsi/scsi_sysfs.c
> @@ -300,7 +300,9 @@ store_shost_eh_deadline(struct device *dev, struct device_attribute *attr,
> int ret = -EINVAL;
> unsigned long deadline, flags;
>
> - if (shost->transportt && shost->transportt->eh_strategy_handler)
> + if (shost->transportt &&
> + (shost->transportt->eh_strategy_handler ||
> + !shost->transportt->eh_host_reset_handler))
I think this bit is supposed to be:
if ((shost->transportt &&
shost->transportt->eh_strategy_handler) ||
!shost->hostt->eh_host_reset_handler)
return ret;
because the field is in the scsi_host_template structure, right?
But, otherwise, this patch is necessary because some drivers don't
implement host reset (e.g. hpsa).
-Ewan
> return ret;
>
> if (!strncmp(buf, "off", strlen("off")))
--
To unsubscribe from this list: 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
