ext4: Ignore i_file_acl_high unless EXT4_FEATURE_INCOMPAT_64BIT is present (a9e81742) · Commits · 戴 / test

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>

fs/ext4/inode.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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);

Admin message