From: akpm@osdl.org <akpm@osdl.org>
Date: Tue, 19 Sep 2006 05:16:03 +0000 (-0700)
Subject: [GFS2] inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-vs-gfs2
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f3b30912e0eab0e4160c7649a5f2b10be68027b9;p=deliverable%2Flinux.git

[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 cc91e482eda0..bd5bc887ef9b 100644
--- 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);
 		}