diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-03-06 10:04:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-27 09:10:38 +0200 |
| commit | a260ff509b4d5fde2ac5f863cd3015cefbc45189 (patch) | |
| tree | 79e2e67eeeeeaf0d30c481dc0875b8d9b46e2aab | |
| parent | 9fc1314285360151792b6ee153c0d5181698986d (diff) | |
ubifs: Fix RENAME_WHITEOUT support
commit c3d9fda688742c06e89aa1f0f8fd943fc11468cb upstream.
Remove faulty leftover check in do_rename(), apparently introduced in a
merge that combined whiteout support changes with commit f03b8ad8d386
("fs: support RENAME_NOREPLACE for local filesystems")
Fixes: f03b8ad8d386 ("fs: support RENAME_NOREPLACE for local filesystems")
Fixes: 9e0a1fff8db5 ("ubifs: Implement RENAME_WHITEOUT")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/ubifs/dir.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index ca16c5d7bab1..0b5a19de4636 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -1088,9 +1088,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, struct timespec time; unsigned int uninitialized_var(saved_nlink); - if (flags & ~RENAME_NOREPLACE) - return -EINVAL; - /* * Budget request settings: deletion direntry, new direntry, removing * the old inode, and changing old and new parent directory inodes. |