1 files changed, 4 insertions, 0 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 36e2bbc60ec7..a3ef091a45bd 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2736,6 +2736,8 @@ has_buffers:
                 pos += blocksize;
         }
 
+        map_bh.b_size = blocksize;
+        map_bh.b_state = 0;
         err = get_block(inode, iblock, &map_bh, 0);
         if (err)
                 goto unlock;
@@ -2933,6 +2935,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