diff options
| author | Jeff Moyer <jmoyer@redhat.com> | 2011-10-17 12:57:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:44:34 -0800 |
| commit | d16a63a89dcb0cece02469b3bb17062c3d48656f (patch) | |
| tree | 689f93069725114ceea9e917d5ec44ea68d7fe1a | |
| parent | e0aef70cc677fdfaa195b04eea389a9b9b40eeaa (diff) | |
| download | linux-stable-d16a63a89dcb0cece02469b3bb17062c3d48656f.tar.gz linux-stable-d16a63a89dcb0cece02469b3bb17062c3d48656f.tar.bz2 linux-stable-d16a63a89dcb0cece02469b3bb17062c3d48656f.zip | |
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] http://www.redhat.com/archives/dm-devel/2011-September/msg00154.html
Reported-by: Christophe Saout <christophe@saout.de>
Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | block/blk-flush.c | 2 |
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) return; } - 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 |