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

Commit c3d9fda6 authored by Felix Fietkau's avatar Felix Fietkau Committed by Richard Weinberger
Browse files

ubifs: Fix RENAME_WHITEOUT support 



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")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 33fda9fa

fs/ubifs/dir.c

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