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

Commit 86b87cde authored by Stanislav Nijnikov's avatar Stanislav Nijnikov Committed by Martin K. Petersen
Browse files

scsi: core: host template attribute groups 



The patch introduces an additional field in the scsi_host_template
structure - struct attribute_group **sdev_group.  This field allows to
define groups of attributes. It will provide an ability to use binary
attributes as well as device attributes and to group them under
subfolders if necessary.

Signed-off-by: default avatarStanislav Nijnikov <stanislav.nijnikov@wdc.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2238d31c

drivers/scsi/scsi_sysfs.c

+11 −0
Original line number Diff line number Diff line
@@ -1310,6 +1310,13 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) 
		}

	}



	if (sdev->host->hostt->sdev_groups) {

		error = sysfs_create_groups(&sdev->sdev_gendev.kobj,

				sdev->host->hostt->sdev_groups);

		if (error)

			return error;

	}



	scsi_autopm_put_device(sdev);

	return error;

}
@@ -1349,6 +1356,10 @@ void __scsi_remove_device(struct scsi_device *sdev) 
		if (res != 0)

			return;



		if (sdev->host->hostt->sdev_groups)

			sysfs_remove_groups(&sdev->sdev_gendev.kobj,

					sdev->host->hostt->sdev_groups);



		bsg_unregister_queue(sdev->request_queue);

		device_unregister(&sdev->sdev_dev);

		transport_remove_device(dev);

include/scsi/scsi_host.h

+6 −0
Original line number Diff line number Diff line
@@ -476,6 +476,12 @@ struct scsi_host_template { 
	 */

	struct device_attribute **sdev_attrs;



	/*

	 * Pointer to the SCSI device attribute groups for this host,

	 * NULL terminated.

	 */

	const struct attribute_group **sdev_groups;



	/*

	 * List of hosts per template.

	 *