Commit c1cadf6a authored by Felix Fietkau's avatar Felix Fietkau Committed by Greg Kroah-Hartman

ubifs: Fix RENAME_WHITEOUT support

commit c3d9fda6 upstream.

Remove faulty leftover check in do_rename(), apparently introduced in a
merge that combined whiteout support changes with commit f03b8ad8
("fs: support RENAME_NOREPLACE for local filesystems")

Fixes: f03b8ad8 ("fs: support RENAME_NOREPLACE for local filesystems")
Fixes: 9e0a1fff ("ubifs: Implement RENAME_WHITEOUT")
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27456652
...@@ -1316,9 +1316,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -1316,9 +1316,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry,
unsigned int uninitialized_var(saved_nlink); unsigned int uninitialized_var(saved_nlink);
struct fscrypt_name old_nm, new_nm; struct fscrypt_name old_nm, new_nm;
if (flags & ~RENAME_NOREPLACE)
return -EINVAL;
/* /*
* Budget request settings: deletion direntry, new direntry, removing * Budget request settings: deletion direntry, new direntry, removing
* the old inode, and changing old and new parent directory inodes. * the old inode, and changing old and new parent directory inodes.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment