Browse files

blk-flush: move the queue kick into

A dm-multipath user reported[1] a problem when trying to boot
a kernel with commit 4853aba
(block: fix flush machinery for stacking drivers with differring
flush flags) applied.  It turns out that an empty flush request
can be sent into blk_insert_flush.  When the BUG_ON was fixed
to allow for this, I/O on the underlying device would stall.  The
reason is that blk_insert_cloned_request does not kick the queue.
In the aforementioned commit, I had added a special case to
kick the queue if data was sent down but the queue flags did
not require a flush.  A better solution is to push the queue
kick up into blk_insert_cloned_request.

This patch, along with a follow-on which fixes the BUG_ON, fixes
the issue reported.


Reported-by: Christophe Saout <>
Signed-off-by: Jeff Moyer <>
Acked-by: Tejun Heo <>

Stable note: 3.1
Signed-off-by: Jens Axboe <>
  • Loading branch information...
JeffMoyer authored and axboe committed Oct 17, 2011
1 parent 834f9f6 commit e67b77c791ca2778198c9e7088f3266ed2da7a55
Showing with 2 additions and 1 deletion.
  1. +2 −0 block/blk-core.c
  2. +0 −1 block/blk-flush.c
@@ -1725,6 +1725,8 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq)
add_acct_request(q, rq, where);
+ __blk_run_queue(q);
spin_unlock_irqrestore(q->queue_lock, flags);
return 0;
@@ -330,7 +330,6 @@ void blk_insert_flush(struct request *rq)
if ((policy & REQ_FSEQ_DATA) &&
list_add_tail(&rq->queuelist, &q->queue_head);
- blk_run_queue_async(q);

0 comments on commit e67b77c

Please sign in to comment.