summaryrefslogtreecommitdiffstats
path: root/fs/ext4/inode.c
diff options
context:
space:
mode:
authorTheodore Ts'o2009-11-15 21:29:56 +0100
committerTheodore Ts'o2009-11-15 21:29:56 +0100
commit1032988c71f3f85483b2b4319684d1205a704c02 (patch)
treeace311067686bf5b93e10ab793ee62b593d8660f /fs/ext4/inode.c
parentext4: fix uninit block bitmap initialization when s_meta_first_bg is non-zero (diff)
downloadkernel-qcow2-linux-1032988c71f3f85483b2b4319684d1205a704c02.tar.gz
kernel-qcow2-linux-1032988c71f3f85483b2b4319684d1205a704c02.tar.xz
kernel-qcow2-linux-1032988c71f3f85483b2b4319684d1205a704c02.zip
ext4: fix block validity checks so they work correctly with meta_bg
The block validity checks used by ext4_data_block_valid() wasn't correctly written to check file systems with the meta_bg feature. Fix this. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: stable@kernel.org
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r--fs/ext4/inode.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 9c097489af89..0c0ddc1401e4 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4884,10 +4884,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
ret = 0;
if (ei->i_file_acl &&
- ((ei->i_file_acl <
- (le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block) +
- EXT4_SB(sb)->s_gdb_count)) ||
- (ei->i_file_acl >= ext4_blocks_count(EXT4_SB(sb)->s_es)))) {
+ !ext4_data_block_valid(EXT4_SB(sb), ei->i_file_acl, 1)) {
ext4_error(sb, __func__,
"bad extended attribute block %llu in inode #%lu",
ei->i_file_acl, inode->i_ino);