From 09a7e2b7c52ae46a80b0c222a71201becaf82aa4 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 24 Apr 2009 18:45:35 -0400 Subject: [PATCH] --- yaml --- r: 144203 b: refs/heads/master c: c4b5a614316c505922a522b2e35ba05ea3e08a7c h: refs/heads/master i: 144201: b930e0e0a955f4b81fe44ac55fdc10ae3e2d585d 144199: 2057276fdb8638006b11160188392eb6ec210a3c v: v3 --- [refs] | 2 +- trunk/fs/ext4/inode.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 34667006a267..46a7b01e2c9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9e817425dc0baede8ebe5fbc9984a640257432b +refs/heads/master: c4b5a614316c505922a522b2e35ba05ea3e08a7c diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index 11460037ea9d..e91f978c7f12 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -4407,6 +4407,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) (__u64)(le32_to_cpu(raw_inode->i_version_hi)) << 32; } + ret = 0; if (ei->i_file_acl && ((ei->i_file_acl < (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) ret = -EIO; goto bad_inode; } else if (ei->i_flags & EXT4_EXTENTS_FL) { - /* Validate extent which is part of inode */ - ret = ext4_ext_check_inode(inode); + if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || + (S_ISLNK(inode->i_mode) && + !ext4_inode_is_fast_symlink(inode))) + /* Validate extent which is part of inode */ + ret = ext4_ext_check_inode(inode); } else if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || (S_ISLNK(inode->i_mode) && !ext4_inode_is_fast_symlink(inode))) {