Merge tag '4.4-scsi-mkp' into misc

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / scsi_sysfs.c

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index db8b21b14117b36dad88a0e17a8c2ee965d07393..658843bb162ad5357192f05229cf2ad73cb846e9 100644 (file)
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -773,6 +773,29 @@ static struct bin_attribute dev_attr_vpd_##_page = {               \
 sdev_vpd_pg_attr(pg83);
 sdev_vpd_pg_attr(pg80);
 
+static ssize_t show_inquiry(struct file *filep, struct kobject *kobj,
+                           struct bin_attribute *bin_attr,
+                           char *buf, loff_t off, size_t count)
+{
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct scsi_device *sdev = to_scsi_device(dev);
+
+       if (!sdev->inquiry)
+               return -EINVAL;
+
+       return memory_read_from_buffer(buf, count, &off, sdev->inquiry,
+                                      sdev->inquiry_len);
+}
+
+static struct bin_attribute dev_attr_inquiry = {
+       .attr = {
+               .name = "inquiry",
+               .mode = S_IRUGO,
+       },
+       .size = 0,
+       .read = show_inquiry,
+};
+
 static ssize_t
 show_iostat_counterbits(struct device *dev, struct device_attribute *attr,
                        char *buf)
@@ -957,6 +980,7 @@ static struct attribute *scsi_sdev_attrs[] = {
 static struct bin_attribute *scsi_sdev_bin_attrs[] = {
        &dev_attr_vpd_pg83,
        &dev_attr_vpd_pg80,
+       &dev_attr_inquiry,
        NULL
 };
 static struct attribute_group scsi_sdev_attr_group = {