5.10-stable patches

added patches:
	kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch

diff --git a/queue-5.10/kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch b/queue-5.10/kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch
new file mode 100644 (file)
index 0000000..b49a948
--- /dev/null
+++ b/queue-5.10/kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch
@@ -0,0 +1,29 @@
+From 213adc63dfbcdff9a0c19ec1f2681fda9c05cf6d Mon Sep 17 00:00:00 2001
+From: Waiman Long <longman@redhat.com>
+Date: Fri, 13 May 2022 15:09:28 -0400
+Subject: kseltest/cgroup: Make test_stress.sh work if run interactively
+
+From: Waiman Long <longman@redhat.com>
+
+commit 213adc63dfbcdff9a0c19ec1f2681fda9c05cf6d upstream.
+
+Commit 54de76c01239 ("kselftest/cgroup: fix test_stress.sh to use OUTPUT
+dir") changes the test_core command path from . to $OUTPUT. However,
+variable OUTPUT may not be defined if the command is run interactively.
+Fix that by using ${OUTPUT:-.} to cover both cases.
+
+Signed-off-by: Waiman Long <longman@redhat.com>
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/cgroup/test_stress.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/testing/selftests/cgroup/test_stress.sh
++++ b/tools/testing/selftests/cgroup/test_stress.sh
+@@ -1,4 +1,4 @@
+ #!/bin/bash
+ # SPDX-License-Identifier: GPL-2.0
+ 
+-./with_stress.sh -s subsys -s fork ${OUTPUT}/test_core
++./with_stress.sh -s subsys -s fork ${OUTPUT:-.}/test_core

diff --git a/queue-5.10/series b/queue-5.10/series
index 9f1f357df0d9b9e02017c4e138d3b18ccd025133..4ff88a04937c8c732f3e1f165623ed9abf8c456a 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -435,3 +435,4 @@ xfs-restore-shutdown-check-in-mapped-write-fault-path.patch
 xfs-force-log-and-push-ail-to-clear-pinned-inodes-when-aborting-mount.patch
 xfs-consider-shutdown-in-bmapbt-cursor-delete-assert.patch
 xfs-assert-in-xfs_btree_del_cursor-should-take-into-account-error.patch
+kseltest-cgroup-make-test_stress.sh-work-if-run-interactively.patch