This is a note to let you know that I've just added the patch titled xfs: remove incorrect ASSERT in xfs_rename to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: xfs-remove-incorrect-assert-in-xfs_rename.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From kuniyu@xxxxxxxxxx Sun Jul 10 16:25:33 2022 From: Kuniyuki Iwashima <kuniyu@xxxxxxxxxx> Date: Thu, 7 Jul 2022 16:07:53 -0700 Subject: xfs: remove incorrect ASSERT in xfs_rename To: <stable@xxxxxxxxxxxxxxx>, <linux-xfs@xxxxxxxxxxxxxxx> Cc: Kuniyuki Iwashima <kuniyu@xxxxxxxxxx>, Ke Xu <kkexu@xxxxxxxxxx>, "Ayushman Dutta" <ayudutta@xxxxxxxxxx>, Eric Sandeen <sandeen@xxxxxxxxxx>, Paolo Bonzini <pbonzini@xxxxxxxxxx>, "Darrick J . Wong" <djwong@xxxxxxxxxx> Message-ID: <20220707230753.32743-1-kuniyu@xxxxxxxxxx> From: Eric Sandeen <sandeen@xxxxxxxxxx> 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@xxxxxxxxxx> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx> Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx> Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> Fixes: 7dcf5c3e4527 ("xfs: add RENAME_WHITEOUT support") Signed-off-by: Kuniyuki Iwashima <kuniyu@xxxxxxxxxx> Acked-by: Darrick J. Wong <djwong@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/xfs/xfs_inode.c | 1 - 1 file changed, 1 deletion(-) --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -3232,7 +3232,6 @@ xfs_rename( * appropriately. */ if (flags & RENAME_WHITEOUT) { - ASSERT(!(flags & (RENAME_NOREPLACE | RENAME_EXCHANGE))); error = xfs_rename_alloc_whiteout(target_dp, &wip); if (error) return error; Patches currently in stable-queue which might be from kuniyu@xxxxxxxxxx are queue-5.4/xfs-remove-incorrect-assert-in-xfs_rename.patch