Merge branch 'master' into next

1 files changed, 2 insertions, 0 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index aed297739eb0..49106127a4aa 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;