diff options
| author | Tao Ma <boyu.mt@taobao.com> | 2012-10-22 00:34:32 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2012-10-22 00:34:32 -0400 |
| commit | 79f1ba49569e5aec919b653c55b03274c2331701 (patch) | |
| tree | 612d4200d13a10d5df0cb6508cc5b1e7fd10fd45 /fs/ext4/bitmap.c | |
| parent | 76495ec1d47e1c0fe0673faf9179bda6bc8ab5c2 (diff) | |
| download | op-kernel-dev-79f1ba49569e5aec919b653c55b03274c2331701.zip op-kernel-dev-79f1ba49569e5aec919b653c55b03274c2331701.tar.gz | |
ext4: Checksum the block bitmap properly with bigalloc enabled
In mke2fs, we only checksum the whole bitmap block and it is right.
While in the kernel, we use EXT4_BLOCKS_PER_GROUP to indicate the
size of the checksumed bitmap which is wrong when we enable bigalloc.
The right size should be EXT4_CLUSTERS_PER_GROUP and this patch fixes
it.
Also as every caller of ext4_block_bitmap_csum_set and
ext4_block_bitmap_csum_verify pass in EXT4_BLOCKS_PER_GROUP(sb)/8,
we'd better removes this parameter and sets it in the function itself.
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/ext4/bitmap.c')
| -rw-r--r-- | fs/ext4/bitmap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ext4/bitmap.c b/fs/ext4/bitmap.c index 5c2d181..3285aa5 100644 --- a/fs/ext4/bitmap.c +++ b/fs/ext4/bitmap.c @@ -58,11 +58,12 @@ void ext4_inode_bitmap_csum_set(struct super_block *sb, ext4_group_t group, int ext4_block_bitmap_csum_verify(struct super_block *sb, ext4_group_t group, struct ext4_group_desc *gdp, - struct buffer_head *bh, int sz) + struct buffer_head *bh) { __u32 hi; __u32 provided, calculated; struct ext4_sb_info *sbi = EXT4_SB(sb); + int sz = EXT4_CLUSTERS_PER_GROUP(sb) / 8; if (!EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) @@ -84,8 +85,9 @@ int ext4_block_bitmap_csum_verify(struct super_block *sb, ext4_group_t group, void ext4_block_bitmap_csum_set(struct super_block *sb, ext4_group_t group, struct ext4_group_desc *gdp, - struct buffer_head *bh, int sz) + struct buffer_head *bh) { + int sz = EXT4_CLUSTERS_PER_GROUP(sb) / 8; __u32 csum; struct ext4_sb_info *sbi = EXT4_SB(sb); |
