diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-03-06 10:04:25 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2017-03-30 09:28:02 +0200 |
| commit | c3d9fda688742c06e89aa1f0f8fd943fc11468cb (patch) | |
| tree | 096708d4b04cf9637409b127dcb78340e6341723 | |
| parent | ubifs: Fix debug messages for an invalid filename in ubifs_dump_inode (diff) | |
| download | linux-c3d9fda688742c06e89aa1f0f8fd943fc11468cb.tar.xz linux-c3d9fda688742c06e89aa1f0f8fd943fc11468cb.zip | |
ubifs: Fix RENAME_WHITEOUT support
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")
Cc: stable@vger.kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Richard Weinberger <richard@nod.at>
| -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 87b04dc3a86e..0858213a4e63 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -1318,9 +1318,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, unsigned int uninitialized_var(saved_nlink); struct fscrypt_name old_nm, new_nm; - 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. |