[GFS2] inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-vs-gfs2

i_blksize got removed in -mm.

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

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index cc91e482eda00d213934e9dfa30df9e867ce866c..bd5bc887ef9b63162e53a42ac65b4868a92b0eac 100644 (file)
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -508,7 +508,7 @@ static int gfs2_block_pointers(struct inode *inode, u64 lblock, int create,
                        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);
                }