| Message ID | 20201118153032.17281-1-jack@suse.cz |
|---|---|
| State | Accepted |
| Headers | show |
| Series | ext4: Fix bogus warning in ext4_update_dx_flag() | expand |
On Wed, Nov 18, 2020 at 04:30:32PM +0100, Jan Kara wrote: > 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. > > Reported-by: Eric Biggers <ebiggers@kernel.org> > Fixes: 48a34311953d ("ext4: fix checksum errors with indexed dirs") > Signed-off-by: Jan Kara <jack@suse.cz> Looks good, Reviewed-by: Eric Biggers <ebiggers@google.com> - Eric
On Wed, Nov 18, 2020 at 01:53:10PM -0800, Eric Biggers wrote: > On Wed, Nov 18, 2020 at 04:30:32PM +0100, Jan Kara wrote: > > 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. > > > > Reported-by: Eric Biggers <ebiggers@kernel.org> > > Fixes: 48a34311953d ("ext4: fix checksum errors with indexed dirs") > > Signed-off-by: Jan Kara <jack@suse.cz> > > Looks good, > > Reviewed-by: Eric Biggers <ebiggers@google.com> Applied, thanks. - Ted
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index f976b5089476..5ee04ee27769 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2685,7 +2685,8 @@ void ext4_insert_dentry(struct inode *inode, 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);
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. Reported-by: Eric Biggers <ebiggers@kernel.org> Fixes: 48a34311953d ("ext4: fix checksum errors with indexed dirs") Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ext4/ext4.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)