From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Tue, 23 Oct 2007 13:08:19 +0000 (+0200)
Subject: blk_sync_queue() should cancel request_queue->unplug_work
X-Git-Tag: v2.6.24-rc2~103^2~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abbeb88d00bef294ce661a9229c1dc31be064545;p=linux-2.6

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>
---

diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 49c0f18cb7..d8616e6ebd 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1738,6 +1738,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);
 }
 EXPORT_SYMBOL(blk_sync_queue);