-
由 Eric Sandeen 提交于
stable inclusion from stable-v5.10.130 commit e14930e9f9c657cf109326752871d3c701b12326 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I5YRJO Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e14930e9f9c657cf109326752871d3c701b12326 -------------------------------- commit e4459765 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: NPaolo Bonzini <pbonzini@redhat.com> Signed-off-by: NEric Sandeen <sandeen@redhat.com> Reviewed-by: NDarrick J. Wong <djwong@kernel.org> Signed-off-by: NDarrick J. Wong <djwong@kernel.org> Fixes: 7dcf5c3e ("xfs: add RENAME_WHITEOUT support") Signed-off-by: NKuniyuki Iwashima <kuniyu@amazon.com> Acked-by: NDarrick J. Wong <djwong@kernel.org> Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com> Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
5e5f6756