ubifs: Fix RENAME_WHITEOUT support
authorFelix Fietkau <nbd@nbd.name>
Mon, 6 Mar 2017 09:04:25 +0000 (10:04 +0100)
committerRichard Weinberger <richard@nod.at>
Thu, 30 Mar 2017 07:28:02 +0000 (09:28 +0200)
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>
fs/ubifs/dir.c

index 87b04dc3a86e6666ecd923438ccd7496a51cb7e5..0858213a4e638a8f093e14e1f91ed8ed1100361b 100644 (file)
@@ -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.