Skip to content

Commit

Permalink
ubifs: Fix RENAME_WHITEOUT support
Browse files Browse the repository at this point in the history
Remove faulty leftover check in do_rename(), apparently introduced in a
merge that combined whiteout support changes with commit f03b8ad
("fs: support RENAME_NOREPLACE for local filesystems")

Fixes: f03b8ad ("fs: support RENAME_NOREPLACE for local
filesystems")
Fixes: 9e0a1ff ("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>
  • Loading branch information
Felix Fietkau authored and Richard Weinberger committed Mar 30, 2017
1 parent 33fda9f commit c3d9fda
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions fs/ubifs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit c3d9fda

Please sign in to comment.