diff options
author | James Bottomley <JBottomley@Odin.com> | 2015-11-12 13:06:18 +0100 |
---|---|---|
committer | James Bottomley <JBottomley@Odin.com> | 2015-11-12 13:06:18 +0100 |
commit | febdfbd2137a5727f70dfbf920105c07e6c2a21e (patch) | |
tree | 9483a5493ad3e08626e1f53ded594f88a6f4e710 /drivers/scsi/scsi_sysfs.c | |
parent | stex: Remove use of struct timeval (diff) | |
parent | sd: Clear PS bit before Mode Select. (diff) | |
download | linux-febdfbd2137a5727f70dfbf920105c07e6c2a21e.tar.xz linux-febdfbd2137a5727f70dfbf920105c07e6c2a21e.zip |
Merge tag '4.4-scsi-mkp' into misc
SCSI queue for 4.4.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/scsi_sysfs.c')
-rw-r--r-- | drivers/scsi/scsi_sysfs.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index db8b21b14117..658843bb162a 100644 --- 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 = { |