[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1318454562-25291-3-git-send-email-jmoyer@redhat.com>
Date: Wed, 12 Oct 2011 17:22:42 -0400
From: Jeff Moyer <jmoyer@...hat.com>
To: linux-kernel@...r.kernel.org, jaxboe@...ionio.com
Cc: tj@...nel.org, christophe@...ut.de, dm-devel@...hat.com,
msnitzer@...hat.com, Jeff Moyer <jmoyer@...hat.com>
Subject: [PATCH 2/2] blk-flush: fix invalid BUG_ON in blk_insert_flush
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@...ut.de>
Signed-off-by: Jeff Moyer <jmoyer@...hat.com
Signed-off-by: Jeff Moyer <jmoyer@...hat.com>
---
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 0ff29c6..720ad60 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
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists