aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ext4/inode.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 11460037ea9d..e91f978c7f12 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4407,6 +4407,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
4407 (__u64)(le32_to_cpu(raw_inode->i_version_hi)) << 32; 4407 (__u64)(le32_to_cpu(raw_inode->i_version_hi)) << 32;
4408 } 4408 }
4409 4409
4410 ret = 0;
4410 if (ei->i_file_acl && 4411 if (ei->i_file_acl &&
4411 ((ei->i_file_acl < 4412 ((ei->i_file_acl <
4412 (le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block) + 4413 (le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block) +
@@ -4418,8 +4419,11 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
4418 ret = -EIO; 4419 ret = -EIO;
4419 goto bad_inode; 4420 goto bad_inode;
4420 } else if (ei->i_flags & EXT4_EXTENTS_FL) { 4421 } else if (ei->i_flags & EXT4_EXTENTS_FL) {
4421 /* Validate extent which is part of inode */ 4422 if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
4422 ret = ext4_ext_check_inode(inode); 4423 (S_ISLNK(inode->i_mode) &&
4424 !ext4_inode_is_fast_symlink(inode)))
4425 /* Validate extent which is part of inode */
4426 ret = ext4_ext_check_inode(inode);
4423 } else if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || 4427 } else if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
4424 (S_ISLNK(inode->i_mode) && 4428 (S_ISLNK(inode->i_mode) &&
4425 !ext4_inode_is_fast_symlink(inode))) { 4429 !ext4_inode_is_fast_symlink(inode))) {