Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a260ff50 authored by Felix Fietkau's avatar Felix Fietkau Committed by Greg Kroah-Hartman
Browse files

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 f03b8ad8
("fs: support RENAME_NOREPLACE for local filesystems")

Fixes: f03b8ad8 ("fs: support RENAME_NOREPLACE for local filesystems")
Fixes: 9e0a1fff ("ubifs: Implement RENAME_WHITEOUT")
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9fc13142

fs/ubifs/dir.c

+0 −3
Original line number Diff line number Diff line
@@ -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.