diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-04-15 01:23:46 +0400 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-04-15 01:23:46 +0400 |
commit | 2c41c8eb2b3014ddb4de53fec533edfa47a96db3 (patch) | |
tree | 2a11d9b2fbc72598589523742eac98af3a09d3ff /block | |
parent | dbb07139ef78699b07137e3974aa9638cfa2d57a (diff) | |
parent | 2609fbf2f5158f57b1c41a5fa2c18fffc6016342 (diff) |
Automatically merging tracking-linaro-android-3.14 into merge-linux-linaro-core-tracking
Conflicting files:
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 791f4194313..3bceeb40aec 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 789cdea0589..c7942acf137 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) |