aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'block/blk-core.c')
-rw-r--r--block/blk-core.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 20e1724ccb4c..2fdcd0cff57f 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -408,7 +408,7 @@ void blk_sync_queue(struct request_queue *q)
408{ 408{
409 del_timer_sync(&q->unplug_timer); 409 del_timer_sync(&q->unplug_timer);
410 del_timer_sync(&q->timeout); 410 del_timer_sync(&q->timeout);
411 kblockd_flush_work(&q->unplug_work); 411 cancel_work_sync(&q->unplug_work);
412} 412}
413EXPORT_SYMBOL(blk_sync_queue); 413EXPORT_SYMBOL(blk_sync_queue);
414 414
@@ -2147,12 +2147,6 @@ int kblockd_schedule_work(struct request_queue *q, struct work_struct *work)
2147} 2147}
2148EXPORT_SYMBOL(kblockd_schedule_work); 2148EXPORT_SYMBOL(kblockd_schedule_work);
2149 2149
2150void kblockd_flush_work(struct work_struct *work)
2151{
2152 cancel_work_sync(work);
2153}
2154EXPORT_SYMBOL(kblockd_flush_work);
2155
2156int __init blk_dev_init(void) 2150int __init blk_dev_init(void)
2157{ 2151{
2158 kblockd_workqueue = create_workqueue("kblockd"); 2152 kblockd_workqueue = create_workqueue("kblockd");