| Message ID | 1447081703-110552-17-git-send-email-hare@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2015-11-09 at 16:08 +0100, Hannes Reinecke wrote: > Use scsi_vpd_lun_id() to export the device id to sysfs. > > Signed-off-by: Hannes Reinecke <hare@suse.de> > --- > drivers/scsi/scsi_sysfs.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c > index 7b41b2c..aaa38c2 100644 > --- a/drivers/scsi/scsi_sysfs.c > +++ b/drivers/scsi/scsi_sysfs.c > @@ -903,6 +903,22 @@ sdev_show_function(queue_depth, "%d\n"); > static DEVICE_ATTR(queue_depth, S_IRUGO | S_IWUSR, > sdev_show_queue_depth, > sdev_store_queue_depth); > > +static ssize_t > +sdev_show_device_id(struct device *dev, struct device_attribute > *attr, > + char *buf) > +{ > + struct scsi_device *sdev = to_scsi_device(dev); > + ssize_t count; > + > + count = scsi_vpd_lun_id(sdev, buf, PAGE_SIZE); > + if (count > 0) { > + buf[count] = '\n'; > + count++; > + } > + return count; > +} > +static DEVICE_ATTR(device_id, S_IRUGO, sdev_show_device_id, NULL); > + > #ifdef CONFIG_SCSI_DH > static ssize_t > sdev_show_dh_state(struct device *dev, struct device_attribute > *attr, > @@ -1026,6 +1042,7 @@ static struct attribute *scsi_sdev_attrs[] = { > &dev_attr_modalias.attr, > &dev_attr_queue_depth.attr, > &dev_attr_queue_type.attr, > + &dev_attr_device_id.attr, > #ifdef CONFIG_SCSI_DH > &dev_attr_dh_state.attr, > #endif Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 7b41b2c..aaa38c2 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -903,6 +903,22 @@ sdev_show_function(queue_depth, "%d\n"); static DEVICE_ATTR(queue_depth, S_IRUGO | S_IWUSR, sdev_show_queue_depth, sdev_store_queue_depth); +static ssize_t +sdev_show_device_id(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct scsi_device *sdev = to_scsi_device(dev); + ssize_t count; + + count = scsi_vpd_lun_id(sdev, buf, PAGE_SIZE); + if (count > 0) { + buf[count] = '\n'; + count++; + } + return count; +} +static DEVICE_ATTR(device_id, S_IRUGO, sdev_show_device_id, NULL); + #ifdef CONFIG_SCSI_DH static ssize_t sdev_show_dh_state(struct device *dev, struct device_attribute *attr, @@ -1026,6 +1042,7 @@ static struct attribute *scsi_sdev_attrs[] = { &dev_attr_modalias.attr, &dev_attr_queue_depth.attr, &dev_attr_queue_type.attr, + &dev_attr_device_id.attr, #ifdef CONFIG_SCSI_DH &dev_attr_dh_state.attr, #endif
Use scsi_vpd_lun_id() to export the device id to sysfs. Signed-off-by: Hannes Reinecke <hare@suse.de> --- drivers/scsi/scsi_sysfs.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)