Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad469a57 authored Jan 17, 2014 by Hannes Reinecke Committed by James Bottomley Mar 15, 2014

[SCSI] scsi_error: disable eh_deadline if no host_reset_handler is set



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.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent f2495e22

drivers/scsi/hosts.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -398,7 +398,7 @@ struct Scsi_Host scsi_host_alloc(struct scsi_host_template sht, int privsize)
		shost->ordered_tag = sht->ordered_tag;
		shost->no_write_same = sht->no_write_same;

		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,

drivers/scsi/scsi_sysfs.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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->hostt->eh_host_reset_handler))
		return ret;

		if (!strncmp(buf, "off", strlen("off")))