From: Max Kellermann <max.kellermann@xxxxxxxxx> This reverts commit 484fd6c1de13b336806a967908a927cc0356e312. The commit caused a regression because now the umask was applied to symlinks and the fix is unnecessary because the umask/O_TMPFILE bug has been fixed somewhere else already. Fixes: https://lore.kernel.org/lkml/28DSITL9912E1.2LSZUVTGTO52Q@xxxxxxxxxxx/ Signed-off-by: Max Kellermann <max.kellermann@xxxxxxxxx> Reviewed-by: Christian Brauner <brauner@xxxxxxxxxx> Tested-by: Michael Forney <mforney@xxxxxxxxxxx> Link: https://lore.kernel.org/r/20240315142956.2420360-1-max.kellermann@xxxxxxxxx Signed-off-by: Theodore Ts'o <tytso@xxxxxxx> (cherry picked from commit c77194965dd0dcc26f9c1671d2e74e4eb1248af5) --- This revert never reached linux-5.15.y, and caused the same regression with symbolic links. The original problem is just as the revert states fixed and the test program for O_TMPFILE works as expected. --- fs/ext4/acl.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h index 0db6ae0ca936..3219669732bf 100644 --- a/fs/ext4/acl.h +++ b/fs/ext4/acl.h @@ -68,11 +68,6 @@ extern int ext4_init_acl(handle_t *, struct inode *, struct inode *); static inline int ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir) { - /* usually, the umask is applied by posix_acl_create(), but if - ext4 ACL support is disabled at compile time, we need to do - it here, because posix_acl_create() will never be called */ - inode->i_mode &= ~current_umask(); - return 0; } #endif /* CONFIG_EXT4_FS_POSIX_ACL */ -- 2.36.0
