summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorakpm@osdl.org <akpm@osdl.org>2006-09-18 22:16:03 -0700
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-19 08:43:01 -0400
commitf3b30912e0eab0e4160c7649a5f2b10be68027b9 (patch)
treee5fa7bc44825b819bf1ea082085f3ef98518e45a /fs
parent07903c02d056452da369595f00eac078bf4c7ef0 (diff)
downloadlinux-stable-f3b30912e0eab0e4160c7649a5f2b10be68027b9.tar.gz
linux-stable-f3b30912e0eab0e4160c7649a5f2b10be68027b9.tar.bz2
linux-stable-f3b30912e0eab0e4160c7649a5f2b10be68027b9.zip
[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>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/bmap.c2
1 files changed, 1 insertions, 1 deletions
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);
}