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

Commit 7a39ac3f authored by James Bottomley's avatar James Bottomley Committed by James Bottomley
Browse files

[SCSI] make supported_mode default to initiator. 



if shost->supported mode is zero (i.e. MODE_UNKNOWN) show it as
initiator (it's obviously an unconverted driver that won't do target).

Acked-by: default avatarFUJITA Tomonori <tomof@acm.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 645a0c6c

drivers/scsi/hosts.c

+6 −0
Original line number Diff line number Diff line
@@ -345,6 +345,12 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) 
	shost->active_mode = sht->supported_mode;

	shost->use_sg_chaining = sht->use_sg_chaining;



	if (sht->supported_mode == MODE_UNKNOWN)

		/* means we didn't set it ... default to INITIATOR */

		shost->active_mode = MODE_INITIATOR;

	else

		shost->active_mode = sht->supported_mode;



	if (sht->max_host_blocked)

		shost->max_host_blocked = sht->max_host_blocked;

	else

drivers/scsi/scsi_sysfs.c

+6 −4
Original line number Diff line number Diff line
@@ -209,11 +209,13 @@ show_shost_mode(unsigned int mode, char *buf) 
static ssize_t show_shost_supported_mode(struct class_device *class_dev, char *buf)

{

	struct Scsi_Host *shost = class_to_shost(class_dev);

	unsigned int supported_mode = shost->hostt->supported_mode;



	if (shost->hostt->supported_mode == MODE_UNKNOWN)

		return snprintf(buf, 20, "unknown\n");

	else

		return show_shost_mode(shost->hostt->supported_mode, buf);

	if (supported_mode == MODE_UNKNOWN)

		/* by default this should be initiator */

		supported_mode = MODE_INITIATOR;



	return show_shost_mode(supported_mode, buf);

}



static CLASS_DEVICE_ATTR(supported_mode, S_IRUGO | S_IWUSR, show_shost_supported_mode, NULL);