diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-21 15:20:27 +0400 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-05-21 15:20:27 +0400 |
commit | 55b1c558bb2c8407cc2a2c68dd654cf1117ce60b (patch) | |
tree | 325f2de6ff5d3b21815c0926688363005a8ead2c /block | |
parent | 1be8086741a48bc3766b0ee98c35665290039aaf (diff) | |
parent | e608a1e336aec6026cf4c06391f4d06169eafdc4 (diff) |
Merge branch 'rebase-linaro-android-3.4' into merge-linux-linaro-core-tracking
Diffstat (limited to 'block')
-rw-r--r-- | block/genhd.c | 17 | ||||
-rw-r--r-- | block/partition-generic.c | 11 |
2 files changed, 28 insertions, 0 deletions
diff --git a/block/genhd.c b/block/genhd.c index 9cf5583c90ff..53c3f7e212a7 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1109,6 +1109,22 @@ static void disk_release(struct device *dev) blk_put_queue(disk->queue); kfree(disk); } + +static int disk_uevent(struct device *dev, struct kobj_uevent_env *env) +{ + struct gendisk *disk = dev_to_disk(dev); + struct disk_part_iter piter; + struct hd_struct *part; + int cnt = 0; + + disk_part_iter_init(&piter, disk, 0); + while((part = disk_part_iter_next(&piter))) + cnt++; + disk_part_iter_exit(&piter); + add_uevent_var(env, "NPARTS=%u", cnt); + return 0; +} + struct class block_class = { .name = "block", }; @@ -1127,6 +1143,7 @@ static struct device_type disk_type = { .groups = disk_attr_groups, .release = disk_release, .devnode = block_devnode, + .uevent = disk_uevent, }; #ifdef CONFIG_PROC_FS diff --git a/block/partition-generic.c b/block/partition-generic.c index 6df5d6928a44..803d1513f4c6 100644 --- a/block/partition-generic.c +++ b/block/partition-generic.c @@ -216,10 +216,21 @@ static void part_release(struct device *dev) kfree(p); } +static int part_uevent(struct device *dev, struct kobj_uevent_env *env) +{ + struct hd_struct *part = dev_to_part(dev); + + add_uevent_var(env, "PARTN=%u", part->partno); + if (part->info && part->info->volname[0]) + add_uevent_var(env, "PARTNAME=%s", part->info->volname); + return 0; +} + struct device_type part_type = { .name = "partition", .groups = part_attr_groups, .release = part_release, + .uevent = part_uevent, }; static void delete_partition_rcu_cb(struct rcu_head *head) |