From df9685a4e10bbf359b3c86ad5c8cebdfae562a10 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 10 Jul 2022 16:28:14 +0200 Subject: [PATCH] 5.4-stable patches added patches: xfs-remove-incorrect-assert-in-xfs_rename.patch --- queue-5.4/series | 1 + ...emove-incorrect-assert-in-xfs_rename.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 queue-5.4/xfs-remove-incorrect-assert-in-xfs_rename.patch diff --git a/queue-5.4/series b/queue-5.4/series index 84f1099cf7c..cc0fac6d806 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -15,3 +15,4 @@ powerpc-powernv-delay-rng-platform-device-creation-until-later-in-boot.patch can-kvaser_usb-replace-run-time-checks-with-struct-kvaser_usb_driver_info.patch can-kvaser_usb-kvaser_usb_leaf-fix-can-clock-frequency-regression.patch can-kvaser_usb-kvaser_usb_leaf-fix-bittiming-limits.patch +xfs-remove-incorrect-assert-in-xfs_rename.patch diff --git a/queue-5.4/xfs-remove-incorrect-assert-in-xfs_rename.patch b/queue-5.4/xfs-remove-incorrect-assert-in-xfs_rename.patch new file mode 100644 index 00000000000..e1e7b6b9a41 --- /dev/null +++ b/queue-5.4/xfs-remove-incorrect-assert-in-xfs_rename.patch @@ -0,0 +1,40 @@ +From kuniyu@amazon.com Sun Jul 10 16:25:33 2022 +From: Kuniyuki Iwashima +Date: Thu, 7 Jul 2022 16:07:53 -0700 +Subject: xfs: remove incorrect ASSERT in xfs_rename +To: , +Cc: Kuniyuki Iwashima , Ke Xu , "Ayushman Dutta" , Eric Sandeen , Paolo Bonzini , "Darrick J . Wong" +Message-ID: <20220707230753.32743-1-kuniyu@amazon.com> + +From: Eric Sandeen + +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 +Signed-off-by: Eric Sandeen +Reviewed-by: Darrick J. Wong +Signed-off-by: Darrick J. Wong +Fixes: 7dcf5c3e4527 ("xfs: add RENAME_WHITEOUT support") +Signed-off-by: Kuniyuki Iwashima +Acked-by: Darrick J. Wong +Signed-off-by: Greg Kroah-Hartman +--- + 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; -- 2.47.3