diff options
| author | codeworkx <daniel.hillenbrand@codeworkx.de> | 2012-06-02 13:09:29 +0200 |
|---|---|---|
| committer | codeworkx <daniel.hillenbrand@codeworkx.de> | 2012-06-02 13:09:29 +0200 |
| commit | c6da2cfeb05178a11c6d062a06f8078150ee492f (patch) | |
| tree | f3b4021d252c52d6463a9b3c1bb7245e399b009c /block | |
| parent | c6d7c4dbff353eac7919342ae6b3299a378160a6 (diff) | |
| download | kernel_samsung_smdk4412-c6da2cfeb05178a11c6d062a06f8078150ee492f.tar.gz kernel_samsung_smdk4412-c6da2cfeb05178a11c6d062a06f8078150ee492f.tar.bz2 kernel_samsung_smdk4412-c6da2cfeb05178a11c6d062a06f8078150ee492f.zip | |
samsung update 1
Diffstat (limited to 'block')
| -rw-r--r-- | block/genhd.c | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/block/genhd.c b/block/genhd.c index 8c0829a3637..18a6d58105e 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1113,6 +1113,26 @@ 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); +#ifdef CONFIG_USB_HOST_NOTIFY + if (disk->interfaces == GENHD_IF_USB) + add_uevent_var(env, "MEDIAPRST=%d", disk->media_present); +#endif + return 0; +} + struct class block_class = { .name = "block", }; @@ -1131,6 +1151,7 @@ static struct device_type disk_type = { .groups = disk_attr_groups, .release = disk_release, .devnode = block_devnode, + .uevent = disk_uevent, }; #ifdef CONFIG_PROC_FS @@ -1586,12 +1607,15 @@ static void disk_events_workfn(struct work_struct *work) struct gendisk *disk = ev->disk; char *envp[ARRAY_SIZE(disk_uevents) + 1] = { }; unsigned int clearing = ev->clearing; - unsigned int events; + unsigned int events = 0; unsigned long intv; int nr_events = 0, i; - /* check events */ - events = disk->fops->check_events(disk, clearing); +#ifdef CONFIG_USB_HOST_NOTIFY + if (disk->interfaces != GENHD_IF_USB) + /* check events */ + events = disk->fops->check_events(disk, clearing); +#endif /* accumulate pending events and schedule next poll if necessary */ spin_lock_irq(&ev->lock); @@ -1615,8 +1639,13 @@ static void disk_events_workfn(struct work_struct *work) if (events & disk->events & (1 << i)) envp[nr_events++] = disk_uevents[i]; - if (nr_events) - kobject_uevent_env(&disk_to_dev(disk)->kobj, KOBJ_CHANGE, envp); +#ifdef CONFIG_USB_HOST_NOTIFY + if (disk->interfaces != GENHD_IF_USB) { + if (nr_events) + kobject_uevent_env(&disk_to_dev(disk)->kobj, + KOBJ_CHANGE, envp); + } +#endif } /* |