Skip to content

Commit c9f62c8

Browse files
Eric Whitneytytso
authored andcommitted
ext4: fix RENAME_WHITEOUT handling for inline directories
A significant number of xfstests can cause ext4 to log one or more warning messages when they are run on a test file system where the inline_data feature has been enabled. An example: "EXT4-fs warning (device vdc): ext4_dirblock_csum_set:425: inode #16385: comm fsstress: No space for directory leaf checksum. Please run e2fsck -D." The xfstests include: ext4/057, 058, and 307; generic/013, 051, 068, 070, 076, 078, 083, 232, 269, 270, 390, 461, 475, 476, 482, 579, 585, 589, 626, 631, and 650. In this situation, the warning message indicates a bug in the code that performs the RENAME_WHITEOUT operation on a directory entry that has been stored inline. It doesn't detect that the directory is stored inline, and incorrectly attempts to compute a dirent block checksum on the whiteout inode when creating it. This attempt fails as a result of the integrity checking in get_dirent_tail (usually due to a failure to match the EXT4_FT_DIR_CSUM magic cookie), and the warning message is then emitted. Fix this by simply collecting the inlined data state at the time the search for the source directory entry is performed. Existing code handles the rest, and this is sufficient to eliminate all spurious warning messages produced by the tests above. Go one step further and do the same in the code that resets the source directory entry in the event of failure. The inlined state should be present in the "old" struct, but given the possibility of a race there's no harm in taking a conservative approach and getting that information again since the directory entry is being reread anyway. Fixes: b7ff91f ("ext4: find old entry again if failed to rename whiteout") Cc: [email protected] Signed-off-by: Eric Whitney <[email protected]> Reviewed-by: Jan Kara <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent 60db00e commit c9f62c8

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

fs/ext4/namei.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,11 +1595,10 @@ static struct buffer_head *__ext4_find_entry(struct inode *dir,
15951595
int has_inline_data = 1;
15961596
ret = ext4_find_inline_entry(dir, fname, res_dir,
15971597
&has_inline_data);
1598-
if (has_inline_data) {
1599-
if (inlined)
1600-
*inlined = 1;
1598+
if (inlined)
1599+
*inlined = has_inline_data;
1600+
if (has_inline_data)
16011601
goto cleanup_and_exit;
1602-
}
16031602
}
16041603

16051604
if ((namelen <= 2) && (name[0] == '.') &&
@@ -3646,7 +3645,8 @@ static void ext4_resetent(handle_t *handle, struct ext4_renament *ent,
36463645
* so the old->de may no longer valid and need to find it again
36473646
* before reset old inode info.
36483647
*/
3649-
old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, NULL);
3648+
old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de,
3649+
&old.inlined);
36503650
if (IS_ERR(old.bh))
36513651
retval = PTR_ERR(old.bh);
36523652
if (!old.bh)
@@ -3813,7 +3813,8 @@ static int ext4_rename(struct user_namespace *mnt_userns, struct inode *old_dir,
38133813
return retval;
38143814
}
38153815

3816-
old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, NULL);
3816+
old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de,
3817+
&old.inlined);
38173818
if (IS_ERR(old.bh))
38183819
return PTR_ERR(old.bh);
38193820
/*

0 commit comments

Comments
 (0)