2 files changed, 3 insertions, 0 deletions

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index c260de6d7b6d..8a337640a46a 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -632,6 +632,8 @@ static int ext2_get_blocks(struct inode *inode,
         int count = 0;
         ext2_fsblk_t first_block = 0;
 
+        BUG_ON(maxblocks == 0);
+
         depth = ext2_block_to_path(inode,iblock,offsets,&blocks_to_boundary);
 
         if (depth == 0)
diff --git a/fs/ext2/xip.c b/fs/ext2/xip.c
index 1c3312858fcf..e98171a11cfe 100644
--- a/fs/ext2/xip.c
+++ b/fs/ext2/xip.c
@@ -35,6 +35,7 @@ __ext2_get_block(struct inode *inode, pgoff_t pgoff, int create,
         int rc;
 
         memset(&tmp, 0, sizeof(struct buffer_head));
+        tmp.b_size = 1 << inode->i_blkbits;
         rc = ext2_get_block(inode, pgoff, &tmp, create);
         *result = tmp.b_blocknr;