diff options
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-cgroup.c | 5 | ||||
-rw-r--r-- | block/blk-ioc.c | 4 | ||||
-rw-r--r-- | block/blk-settings.c | 4 | ||||
-rw-r--r-- | block/cfq-iosched.c | 5 | ||||
-rw-r--r-- | block/deadline-iosched.c | 4 | ||||
-rw-r--r-- | block/genhd.c | 43 | ||||
-rw-r--r-- | block/noop-iosched.c | 4 |
7 files changed, 63 insertions, 6 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index b596e54ddd71..345843f4bb57 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1660,7 +1660,10 @@ static void __exit exit_cgroup_blkio(void) { cgroup_unload_subsys(&blkio_subsys); } - +#ifdef CONFIG_FAST_RESUME +beforeresume_initcall(init_cgroup_blkio); +#else module_init(init_cgroup_blkio); +#endif module_exit(exit_cgroup_blkio); MODULE_LICENSE("GPL"); diff --git a/block/blk-ioc.c b/block/blk-ioc.c index 342eae9b0d3c..9be30fe6175e 100644 --- a/block/blk-ioc.c +++ b/block/blk-ioc.c @@ -161,4 +161,8 @@ static int __init blk_ioc_init(void) sizeof(struct io_context), 0, SLAB_PANIC, NULL); return 0; } +#ifdef CONFIG_FAST_RESUME +beforeresume_initcall(blk_ioc_init); +#else subsys_initcall(blk_ioc_init); +#endif diff --git a/block/blk-settings.c b/block/blk-settings.c index fa1eb0449a05..dfd0270ec19b 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -803,4 +803,8 @@ static int __init blk_settings_init(void) blk_max_pfn = max_pfn - 1; return 0; } +#ifdef CONFIG_FAST_RESUME +beforeresume_initcall(blk_settings_init); +#else subsys_initcall(blk_settings_init); +#endif diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 23500ac7f0f3..bfe3bbe00973 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -2060,6 +2060,7 @@ static void cfq_dispatch_insert(struct request_queue *q, struct request *rq) cfq_remove_request(rq); cfqq->dispatched++; (RQ_CFQG(rq))->dispatched++; + rq->ioprio = IOPRIO_PRIO_VALUE(cfqq->ioprio_class, cfqq->ioprio); elv_dispatch_sort(q, rq); cfqd->rq_in_flight[cfq_cfqq_sync(cfqq)]++; @@ -4289,7 +4290,11 @@ static void __exit cfq_exit(void) cfq_slab_kill(); } +#ifdef CONFIG_FAST_RESUME +beforeresume_initcall(cfq_init); +#else module_init(cfq_init); +#endif module_exit(cfq_exit); MODULE_AUTHOR("Jens Axboe"); diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c index 5139c0ea1864..301a779ea8b1 100644 --- a/block/deadline-iosched.c +++ b/block/deadline-iosched.c @@ -460,7 +460,11 @@ static void __exit deadline_exit(void) elv_unregister(&iosched_deadline); } +#ifdef CONFIG_FAST_RESUME +beforeresume_initcall(deadline_init); +#else module_init(deadline_init); +#endif module_exit(deadline_exit); MODULE_AUTHOR("Jens Axboe"); diff --git a/block/genhd.c b/block/genhd.c index d7f7d4e3da37..a1c3b935938a 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -918,7 +918,11 @@ static int __init genhd_device_init(void) return 0; } +#ifdef CONFIG_FAST_RESUME +beforeresume_initcall(genhd_device_init); +#else subsys_initcall(genhd_device_init); +#endif static ssize_t disk_range_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -1118,6 +1122,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", }; @@ -1136,6 +1160,7 @@ static struct device_type disk_type = { .groups = disk_attr_groups, .release = disk_release, .devnode = block_devnode, + .uevent = disk_uevent, }; #ifdef CONFIG_PROC_FS @@ -1591,12 +1616,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); @@ -1620,8 +1648,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 } /* diff --git a/block/noop-iosched.c b/block/noop-iosched.c index 06389e9ef96d..18f8bddf9194 100644 --- a/block/noop-iosched.c +++ b/block/noop-iosched.c @@ -104,7 +104,11 @@ static void __exit noop_exit(void) elv_unregister(&elevator_noop); } +#ifdef CONFIG_FAST_RESUME +beforeresume_initcall(noop_init); +#else module_init(noop_init); +#endif module_exit(noop_exit); |