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

Commit 7e47976b authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi_sysfs: add 'is_bin_visible' callback 



Add 'is_bin_visible' callback to blank out unsupported vpd pages.

Reviewed-by: default avatarShane Seymour <shane.seymour@hpe.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fddbeb80

drivers/scsi/scsi_sysfs.c

+17 −0
Original line number Diff line number Diff line
@@ -1023,6 +1023,22 @@ static umode_t scsi_sdev_attr_is_visible(struct kobject *kobj, 
	return attr->mode;

}



static umode_t scsi_sdev_bin_attr_is_visible(struct kobject *kobj,

					     struct bin_attribute *attr, int i)

{

	struct device *dev = container_of(kobj, struct device, kobj);

	struct scsi_device *sdev = to_scsi_device(dev);





	if (attr == &dev_attr_vpd_pg80 && !sdev->vpd_pg80)

		return 0;



	if (attr == &dev_attr_vpd_pg83 && sdev->vpd_pg83)

		return 0;



	return S_IRUGO;

}



/* Default template for device attributes.  May NOT be modified */

static struct attribute *scsi_sdev_attrs[] = {

	&dev_attr_device_blocked.attr,
@@ -1068,6 +1084,7 @@ static struct attribute_group scsi_sdev_attr_group = { 
	.attrs =	scsi_sdev_attrs,

	.bin_attrs =	scsi_sdev_bin_attrs,

	.is_visible =	scsi_sdev_attr_is_visible,

	.is_bin_visible = scsi_sdev_bin_attr_is_visible,

};



static const struct attribute_group *scsi_sdev_attr_groups[] = {