remove-kblockd_flush_work.patch
From: Cheng Renquan <[email protected]>
After many improvements on kblockd_flush_work, it is now identical to cancel_work_sync, so a direct call to cancel_work_sync is suggested.
The only difference is that cancel_work_sync is a GPL symbol, so no non-GPL modules anymore.
Signed-off-by Cheng Renquan <[email protected]>
---
block/as-iosched.c +1 -1
@@ -1344,7 +1344,7 @@ static void as_exit_queue(elevator_t *e)struct as_data *ad = e->elevator_data;del_timer_sync (&ad->antic_timer); -kblockd_flush_work (&ad->antic_work); +cancel_work_sync (&ad->antic_work);BUG_ON (!list_empty (&ad->fifo_list[REQ_SYNC ]));BUG_ON (!list_empty (&ad->fifo_list[REQ_ASYNC ]));
block/blk-core.c +1 -7
@@ -396,7 +396,7 @@ EXPORT_SYMBOL(blk_stop_queue);void blk_sync_queue (struct request_queue *q) {del_timer_sync (&q->unplug_timer); -kblockd_flush_work (&q->unplug_work); +cancel_work_sync (&q->unplug_work); }EXPORT_SYMBOL (blk_sync_queue);
@@ -2113,12 +2113,6 @@ int kblockd_schedule_work(struct request }EXPORT_SYMBOL (kblockd_schedule_work); -void kblockd_flush_work (struct work_struct *work) -{ -cancel_work_sync (work); -} -EXPORT_SYMBOL (kblockd_flush_work); -int __init blk_dev_init (void ) { kblockd_workqueue =create_workqueue ("kblockd" );
block/cfq-iosched.c +1 -1
@@ -2160,7 +2160,7 @@ out_cont:static void cfq_shutdown_timer_wq (struct cfq_data *cfqd) {del_timer_sync (&cfqd->idle_slice_timer); -kblockd_flush_work (&cfqd->unplug_work); +cancel_work_sync (&cfqd->unplug_work); }static void cfq_put_async_queues (struct cfq_data *cfqd)
include/linux/blkdev.h +0 -1
@@ -977,7 +977,6 @@ static inline void put_dev_sector(Sectorstruct work_struct ;int kblockd_schedule_work (struct request_queue *q,struct work_struct *work); -void kblockd_flush_work (struct work_struct *work);#define MODULE_ALIAS_BLOCKDEV (major,minor) \ MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))