From f78d240958d78d7432774bc8663f1cefea7e9736 Mon Sep 17 00:00:00 2001
From: Jeff Moyer <jmoyer@redhat.com>
Date: Mon, 17 Oct 2011 12:57:22 +0200
Subject: [PATCH] --- yaml --- r: 273807 b: refs/heads/master c:
 834f9f61a525d2f6d3d0c93894e26326c8d3ceed h: refs/heads/master i:   273805:
 1edbf8aee35f6e1aa31a0d55e18b3656a96cda65   273803:
 eb1e246df8a547aff35c2ff11614630a3da0876c   273799:
 853aac9ac4d8d49650ae5da687c9a91b7a45e5d0   273791:
 5ff68f31b3ff646092c3e070ebe6fd8755d1fb2f v: v3

---
 [refs]                  | 2 +-
 trunk/block/blk-flush.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 773437c1ad6e..497da17665d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 456be1484ffc72a24bdb4200b5847c4fa90139d9
+refs/heads/master: 834f9f61a525d2f6d3d0c93894e26326c8d3ceed
diff --git a/trunk/block/blk-flush.c b/trunk/block/blk-flush.c
index 491eb30a242d..89ae3b9bf7ca 100644
--- a/trunk/block/blk-flush.c
+++ b/trunk/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