5.10-stable patches

added patches:
	xfs-remove-incorrect-assert-in-xfs_rename.patch

diff --git a/queue-5.10/series b/queue-5.10/series
index b2670adb340a3803935bf735a421350cdcc4a04c..b7ee8445e8c32196e808c401ca71cc807e316e0f 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -21,3 +21,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.10/xfs-remove-incorrect-assert-in-xfs_rename.patch b/queue-5.10/xfs-remove-incorrect-assert-in-xfs_rename.patch
new file mode 100644 (file)
index 0000000..5fedd44
--- /dev/null
+++ b/queue-5.10/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 <kuniyu@amazon.com>
+Date: Thu, 7 Jul 2022 16:07:53 -0700
+Subject: xfs: remove incorrect ASSERT in xfs_rename
+To: <stable@vger.kernel.org>, <linux-xfs@vger.kernel.org>
+Cc: Kuniyuki Iwashima <kuniyu@amazon.com>, Ke Xu <kkexu@amazon.com>, "Ayushman Dutta" <ayudutta@amazon.com>, Eric Sandeen <sandeen@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Darrick J . Wong" <djwong@kernel.org>
+Message-ID: <20220707230753.32743-1-kuniyu@amazon.com>
+
+From: Eric Sandeen <sandeen@redhat.com>
+
+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@redhat.com>
+Signed-off-by: Eric Sandeen <sandeen@redhat.com>
+Reviewed-by: Darrick J. Wong <djwong@kernel.org>
+Signed-off-by: Darrick J. Wong <djwong@kernel.org>
+Fixes: 7dcf5c3e4527 ("xfs: add RENAME_WHITEOUT support")
+Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
+Acked-by: Darrick J. Wong <djwong@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/xfs/xfs_inode.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/fs/xfs/xfs_inode.c
++++ b/fs/xfs/xfs_inode.c
+@@ -3170,7 +3170,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;