diff --git a/[refs] b/[refs]
index 97df31611e85..e28774e718cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79ffab34391933ee3b95dac7f25c0478fa2f8f1e
+refs/heads/master: 8fb0e342481c4d80040670fec915f0b9c7c6499a
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index aed297739eb0..ad0112900222 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -2933,6 +2933,8 @@ int submit_bh(int rw, struct buffer_head * bh)
 	BUG_ON(!buffer_locked(bh));
 	BUG_ON(!buffer_mapped(bh));
 	BUG_ON(!bh->b_end_io);
+	BUG_ON(buffer_delay(bh));
+	BUG_ON(buffer_unwritten(bh));
 
 	/*
 	 * Mask in barrier bit for a write (could be either a WRITE or a