Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd8352d6 authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman
Browse files

ext4: fix bogus warning in ext4_update_dx_flag() 

commit f902b216501094495ff75834035656e8119c537f upstream.

The idea of the warning in ext4_update_dx_flag() is that we should warn
when we are clearing EXT4_INODE_INDEX on a filesystem with metadata
checksums enabled since after clearing the flag, checksums for internal
htree nodes will become invalid. So there's no need to warn (or actually
do anything) when EXT4_INODE_INDEX is not set.

Link: https://lore.kernel.org/r/20201118153032.17281-1-jack@suse.cz


Fixes: 48a34311953d ("ext4: fix checksum errors with indexed dirs")
Reported-by: default avatarEric Biggers <ebiggers@kernel.org>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8d0326a6

fs/ext4/ext4.h

+2 −1
Original line number Diff line number Diff line
@@ -2395,7 +2395,8 @@ int ext4_insert_dentry(struct inode *dir, 
		       struct ext4_filename *fname);

static inline void ext4_update_dx_flag(struct inode *inode)

{

	if (!ext4_has_feature_dir_index(inode->i_sb)) {

	if (!ext4_has_feature_dir_index(inode->i_sb) &&

	    ext4_test_inode_flag(inode, EXT4_INODE_INDEX)) {

		/* ext4_iget() should have caught this... */

		WARN_ON_ONCE(ext4_has_feature_metadata_csum(inode->i_sb));

		ext4_clear_inode_flag(inode, EXT4_INODE_INDEX);