path: root/block
diff options
authorJeff Moyer <>2011-10-17 12:57:22 +0200
committerGreg Kroah-Hartman <>2011-11-11 09:44:34 -0800
commitd16a63a89dcb0cece02469b3bb17062c3d48656f (patch)
tree689f93069725114ceea9e917d5ec44ea68d7fe1a /block
parente0aef70cc677fdfaa195b04eea389a9b9b40eeaa (diff)
blk-flush: fix invalid BUG_ON in blk_insert_flush
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. [1] Reported-by: Christophe Saout <> Signed-off-by: Jeff Moyer <> Acked-by: Tejun Heo <> Signed-off-by: Jens Axboe <> Signed-off-by: Greg Kroah-Hartman <>
Diffstat (limited to 'block')
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-flush.c b/block/blk-flush.c
index 491eb30a242d..89ae3b9bf7ca 100644
--- 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