diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-10-15 09:49:04 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-10-15 09:49:04 +0400 |
| commit | b9685c45b06969ffbf9d95862be2613f5a3daf21 (patch) | |
| tree | 6506ec971c34e2ddb29da2807b42d63016087c86 /block | |
| parent | 0beec622ece1e4154aeeba3b0c5e3a0cf097fc06 (diff) | |
| parent | 5ecd033a0093508f7507512b4d3cb64d9f976925 (diff) | |
Merge branch 'tracking-linaro-android-3.12' 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 791f41943132..3bceeb40aec2 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1107,6 +1107,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", }; @@ -1126,6 +1142,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 789cdea05893..c7942acf1379 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) |