diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-04-30 09:23:42 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:30:25 -0400 |
commit | b03f38b685e2e1db174fb8982930e789a516f414 (patch) | |
tree | 8ad84738e433409647a1450a991dba1ba90d7921 /block/genhd.c | |
parent | f7a386c5b8ff34cd84ae922603d1c6f9d234edee (diff) |
Driver Core: block: add nodename support for block drivers.
This adds support for block drivers to report their requested nodename
to userspace. It also updates a number of block drivers to provide the
needed subdirectory and device name to be used for them.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'block/genhd.c')
-rw-r--r-- | block/genhd.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/block/genhd.c b/block/genhd.c index fe7ccc0a618f..f4c64c2b303a 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
@@ -996,10 +996,20 @@ struct class block_class = { | |||
996 | .name = "block", | 996 | .name = "block", |
997 | }; | 997 | }; |
998 | 998 | ||
999 | static char *block_nodename(struct device *dev) | ||
1000 | { | ||
1001 | struct gendisk *disk = dev_to_disk(dev); | ||
1002 | |||
1003 | if (disk->nodename) | ||
1004 | return disk->nodename(disk); | ||
1005 | return NULL; | ||
1006 | } | ||
1007 | |||
999 | static struct device_type disk_type = { | 1008 | static struct device_type disk_type = { |
1000 | .name = "disk", | 1009 | .name = "disk", |
1001 | .groups = disk_attr_groups, | 1010 | .groups = disk_attr_groups, |
1002 | .release = disk_release, | 1011 | .release = disk_release, |
1012 | .nodename = block_nodename, | ||
1003 | }; | 1013 | }; |
1004 | 1014 | ||
1005 | #ifdef CONFIG_PROC_FS | 1015 | #ifdef CONFIG_PROC_FS |