Messages in this thread Patch in this message | | | Date | Tue, 11 Jan 2005 14:01:36 -0800 | From | Greg KH <> | Subject | [RFC] move struct disk_attribute to genhd.h |
| |
Hi,
Any complaints about me sending this patch onward? It's needed for drivers to put sysfs attributes in their block device subdirectory, like the aoe driver does.
It's against the latest -bk tree.
diffstat: drivers/block/aoe/aoeblk.c | 9 +-------- drivers/block/genhd.c | 6 ------ include/linux/genhd.h | 6 ++++++ 3 files changed, 7 insertions(+), 14 deletions(-)
thanks,
greg k-h
-----
Block: move struct disk_attribute to genhd.h
This allows other block devices to add attributes to their sysfs entries.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
--- a/drivers/block/genhd.c 2005-01-07 11:18:22 -08:00 +++ b/drivers/block/genhd.c 2005-01-11 13:47:01 -08:00 @@ -322,12 +315,6 @@ subsys_initcall(device_init); /* * kobject & sysfs bindings for block devices */ - -struct disk_attribute { - struct attribute attr; - ssize_t (*show)(struct gendisk *, char *); -}; - static ssize_t disk_attr_show(struct kobject *kobj, struct attribute *attr, char *page) { --- a/drivers/block/aoe/aoeblk.c 2005-01-11 09:04:06 -08:00 +++ b/drivers/block/aoe/aoeblk.c 2005-01-11 13:47:26 -08:00 @@ -12,14 +12,7 @@ #include <linux/netdevice.h> #include "aoe.h" -/* add attributes for our block devices in sysfs - * (see drivers/block/genhd.c:disk_attr_show, etc.) - */ -struct disk_attribute { - struct attribute attr; - ssize_t (*show)(struct gendisk *, char *); -}; - +/* add attributes for our block devices in sysfs */ static ssize_t aoedisk_show_state(struct gendisk * disk, char *page) { struct aoedev *d = disk->private_data; --- a/include/linux/genhd.h 2005-01-05 05:13:44 -08:00 +++ b/include/linux/genhd.h 2005-01-11 13:46:27 -08:00 @@ -128,6 +128,12 @@ struct gendisk { #endif }; +/* Structure for sysfs attributes on block devices */ +struct disk_attribute { + struct attribute attr; + ssize_t (*show)(struct gendisk *, char *); +}; + /* * Macros to operate on percpu disk statistics: * - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |