From: Andrew Morton <akpm@osdl.org>

i_blksize got removed in -mm.

Cc: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/gfs2/bmap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/gfs2/bmap.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-vs-gfs2 fs/gfs2/bmap.c
--- a/fs/gfs2/bmap.c~inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-vs-gfs2
+++ a/fs/gfs2/bmap.c
@@ -508,7 +508,7 @@ static int gfs2_block_pointers(struct in
 			boundary = lookup_block(ip, bh, end_of_metadata, mp, 0, &new, &eblock);
 			if (eblock != ++dblock)
 				break;
-			bh_map->b_size += inode->i_blksize;
+			bh_map->b_size += (1 << inode->i_blkbits);
 			if (boundary)
 				set_buffer_boundary(bh_map);
 		}
_