[lkml]   [2011]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[229/264] blk-flush: fix invalid BUG_ON in blk_insert_flush
3.1-stable review patch.  If anyone has any objections, please let me know.

From: Jeff Moyer <>

commit 834f9f61a525d2f6d3d0c93894e26326c8d3ceed upstream.

A user reported a regression due to commit
4853abaae7e4a2af938115ce9071ef8684fb7af4 (block: fix flush
machinery for stacking drivers with differring flush flags).
Part of the problem is that blk_insert_flush required a
single bio be attached to the request. In reality, having
no attached bio is also a valid case, as can be observed with
an empty flush.


Reported-by: Christophe Saout <>
Signed-off-by: Jeff Moyer <>
Acked-by: Tejun Heo <>
Signed-off-by: Jens Axboe <>
Signed-off-by: Greg Kroah-Hartman <>

block/blk-flush.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -320,7 +320,7 @@ void blk_insert_flush(struct request *rq

- BUG_ON(!rq->bio || rq->bio != rq->biotail);
+ BUG_ON(rq->bio != rq->biotail); /*assumes zero or single bio rq */

* If there's data but flush is not necessary, the request can be

 \ /
  Last update: 2011-11-10 05:01    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean