diff options
author | Oleg Nesterov <oleg@tv-sign.ru> | 2007-10-23 09:08:19 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2007-10-29 06:33:05 -0400 |
commit | abbeb88d00bef294ce661a9229c1dc31be064545 (patch) | |
tree | 8e5468b3b2191eb4a497eb7edaa5ac3372c7ff28 | |
parent | 4310864b9d17714e64446bfb8bc7dbcb96454475 (diff) |
blk_sync_queue() should cancel request_queue->unplug_work
blk_sync_queue() cancels the timer, but forgets to cancel the work.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r-- | block/ll_rw_blk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 49c0f18cb783..d8616e6ebd92 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
@@ -1738,6 +1738,7 @@ EXPORT_SYMBOL(blk_stop_queue); | |||
1738 | void blk_sync_queue(struct request_queue *q) | 1738 | void blk_sync_queue(struct request_queue *q) |
1739 | { | 1739 | { |
1740 | del_timer_sync(&q->unplug_timer); | 1740 | del_timer_sync(&q->unplug_timer); |
1741 | kblockd_flush_work(&q->unplug_work); | ||
1741 | } | 1742 | } |
1742 | EXPORT_SYMBOL(blk_sync_queue); | 1743 | EXPORT_SYMBOL(blk_sync_queue); |
1743 | 1744 | ||