diff options
| author | Theodore Ts'o | 2009-04-24 22:11:18 +0200 |
|---|---|---|
| committer | Theodore Ts'o | 2009-04-24 22:11:18 +0200 |
| commit | a9e817425dc0baede8ebe5fbc9984a640257432b (patch) | |
| tree | ff59f9cc8dcee908f58a136554323d8c8fbfcca8 /fs | |
| parent | ext4: Fix softlockup caused by illegal i_file_acl value in on-disk inode (diff) | |
| download | kernel-qcow2-linux-a9e817425dc0baede8ebe5fbc9984a640257432b.tar.gz kernel-qcow2-linux-a9e817425dc0baede8ebe5fbc9984a640257432b.tar.xz kernel-qcow2-linux-a9e817425dc0baede8ebe5fbc9984a640257432b.zip | |
ext4: Ignore i_file_acl_high unless EXT4_FEATURE_INCOMPAT_64BIT is present
Don't try to look at i_file_acl_high unless the INCOMPAT_64BIT feature
bit is set. The field is normally zero, but older versions of e2fsck
didn't automatically check to make sure of this, so in the spirit of
"be liberal in what you accept", don't look at i_file_acl_high unless
we are using a 64-bit filesystem.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/inode.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index cab75bbcd57b..11460037ea9d 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4357,11 +4357,9 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) ei->i_flags = le32_to_cpu(raw_inode->i_flags); inode->i_blocks = ext4_inode_blocks(raw_inode, ei); ei->i_file_acl = le32_to_cpu(raw_inode->i_file_acl_lo); - if (EXT4_SB(inode->i_sb)->s_es->s_creator_os != - cpu_to_le32(EXT4_OS_HURD)) { + if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT)) ei->i_file_acl |= ((__u64)le16_to_cpu(raw_inode->i_file_acl_high)) << 32; - } inode->i_size = ext4_isize(raw_inode); ei->i_disksize = inode->i_size; inode->i_generation = le32_to_cpu(raw_inode->i_generation); |