Commit 79a72162 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-5.16-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs fix from Darrick Wong:
 "Remove an unnecessary (and backwards) rename flags check that
  duplicates a VFS level check"

* tag 'xfs-5.16-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: remove incorrect ASSERT in xfs_rename
parents 23b55d67 e4459765

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;