From: Felix Fietkau Date: Mon, 6 Mar 2017 09:04:25 +0000 (+0100) Subject: ubifs: Fix RENAME_WHITEOUT support X-Git-Tag: v4.14-rc1~1093^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3d9fda688742c06e89aa1f0f8fd943fc11468cb;p=platform%2Fkernel%2Flinux-rpi.git 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 Signed-off-by: Richard Weinberger --- diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 87b04dc..0858213 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.