Commit c465bbcd authored Jul 07, 2022 by Eric Sandeen Committed by Greg Kroah-Hartman Jul 12, 2022

xfs: remove incorrect ASSERT in xfs_rename



commit e445976537ad139162980bee015b7364e5b64fff upstream.

This ASSERT in xfs_rename is a) incorrect, because
(RENAME_WHITEOUT|RENAME_NOREPLACE) is a valid combination, and
b) unnecessary, because actual invalid flag combinations are already
handled at the vfs level in do_renameat2() before we get called.
So, remove it.

Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Fixes: 7dcf5c3e ("xfs: add RENAME_WHITEOUT support")
Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 845dac02

fs/xfs/xfs_inode.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3232,7 +3232,6 @@ xfs_rename(
	* appropriately.		* appropriately.
	*/		*/
	if (flags & RENAME_WHITEOUT) {		if (flags & RENAME_WHITEOUT) {
	ASSERT(!(flags & (RENAME_NOREPLACE \| RENAME_EXCHANGE)));
	error = xfs_rename_alloc_whiteout(target_dp, &wip);		error = xfs_rename_alloc_whiteout(target_dp, &wip);
	if (error)		if (error)
	return error;		return error;