Commit e4459765 authored by Eric Sandeen's avatar Eric Sandeen Committed by Darrick J. Wong
Browse files

xfs: remove incorrect ASSERT in xfs_rename 



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: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 1090427b

fs/xfs/xfs_inode.c

+0 −1
Original line number Diff line number Diff line
@@ -3122,7 +3122,6 @@ xfs_rename( 
	 * appropriately.

	 */

	if (flags & RENAME_WHITEOUT) {

		ASSERT(!(flags & (RENAME_NOREPLACE | RENAME_EXCHANGE)));

		error = xfs_rename_alloc_whiteout(mnt_userns, target_dp, &wip);

		if (error)

			return error;