fix up btrfs patch that quilt chokes on

diff --git a/queue-5.10/btrfs-fix-race-between-quota-disable-and-relocation.patch b/queue-5.10/btrfs-fix-race-between-quota-disable-and-relocation.patch
index be26edb788f5ea15099b9cbc01dee9357ba57d45..d7daadcfe13120f6ccc6ec4bd5f0d81877b21611 100644 (file)
--- a/queue-5.10/btrfs-fix-race-between-quota-disable-and-relocation.patch
+++ b/queue-5.10/btrfs-fix-race-between-quota-disable-and-relocation.patch
@@ -25,14 +25,14 @@ This can be sporadically triggered by test case btrfs/255 from fstests:
 
   btrfs/255 6s ... _check_dmesg: something found in dmesg (see /home/fdmanana/git/hub/xfstests/results//btrfs/255.dmesg)
   - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad)
-      --- tests/btrfs/255.out  2023-03-02 21:47:53.876609426 +0000
-      +++ /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad   2023-06-16 10:20:39.267563212 +0100
-      @@ -1,2 +1,4 @@
-       QA output created by 255
-      +ERROR: error during balancing '/home/fdmanana/btrfs-tests/scratch_1': No such file or directory
-      +There may be more info in syslog - try dmesg | tail
-       Silence is golden
-      ...
+#      --- tests/btrfs/255.out 2023-03-02 21:47:53.876609426 +0000
+#      +++ /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad  2023-06-16 10:20:39.267563212 +0100
+#      @@ -1,2 +1,4 @@
+#       QA output created by 255
+#      +ERROR: error during balancing '/home/fdmanana/btrfs-tests/scratch_1': No such file or directory
+#      +There may be more info in syslog - try dmesg | tail
+#       Silence is golden
+#      ...
       (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/255.out /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad'  to see the entire diff)
   Ran: btrfs/255
   Failures: btrfs/255

diff --git a/queue-5.15/btrfs-fix-race-between-quota-disable-and-relocation.patch b/queue-5.15/btrfs-fix-race-between-quota-disable-and-relocation.patch
index 2ab859eb027da2a7429dd2a070be5ca02f2b4ac0..3c0598c78eebb042ddf88268dd43ba4a1fbf94d0 100644 (file)
--- a/queue-5.15/btrfs-fix-race-between-quota-disable-and-relocation.patch
+++ b/queue-5.15/btrfs-fix-race-between-quota-disable-and-relocation.patch
@@ -25,14 +25,14 @@ This can be sporadically triggered by test case btrfs/255 from fstests:
 
   btrfs/255 6s ... _check_dmesg: something found in dmesg (see /home/fdmanana/git/hub/xfstests/results//btrfs/255.dmesg)
   - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad)
-      --- tests/btrfs/255.out  2023-03-02 21:47:53.876609426 +0000
-      +++ /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad   2023-06-16 10:20:39.267563212 +0100
-      @@ -1,2 +1,4 @@
-       QA output created by 255
-      +ERROR: error during balancing '/home/fdmanana/btrfs-tests/scratch_1': No such file or directory
-      +There may be more info in syslog - try dmesg | tail
-       Silence is golden
-      ...
+#      --- tests/btrfs/255.out 2023-03-02 21:47:53.876609426 +0000
+#      +++ /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad  2023-06-16 10:20:39.267563212 +0100
+#      @@ -1,2 +1,4 @@
+#       QA output created by 255
+#      +ERROR: error during balancing '/home/fdmanana/btrfs-tests/scratch_1': No such file or directory
+#      +There may be more info in syslog - try dmesg | tail
+#       Silence is golden
+#      ...
       (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/255.out /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad'  to see the entire diff)
   Ran: btrfs/255
   Failures: btrfs/255

diff --git a/queue-5.4/btrfs-fix-race-between-quota-disable-and-relocation.patch b/queue-5.4/btrfs-fix-race-between-quota-disable-and-relocation.patch
index 6b9913f87a233b4bcb85f1d856bc87d1e7aa8ce0..3d72c763a7566b76ba94238d5bf78398dc914102 100644 (file)
--- a/queue-5.4/btrfs-fix-race-between-quota-disable-and-relocation.patch
+++ b/queue-5.4/btrfs-fix-race-between-quota-disable-and-relocation.patch
@@ -25,14 +25,14 @@ This can be sporadically triggered by test case btrfs/255 from fstests:
 
   btrfs/255 6s ... _check_dmesg: something found in dmesg (see /home/fdmanana/git/hub/xfstests/results//btrfs/255.dmesg)
   - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad)
-      --- tests/btrfs/255.out  2023-03-02 21:47:53.876609426 +0000
-      +++ /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad   2023-06-16 10:20:39.267563212 +0100
-      @@ -1,2 +1,4 @@
-       QA output created by 255
-      +ERROR: error during balancing '/home/fdmanana/btrfs-tests/scratch_1': No such file or directory
-      +There may be more info in syslog - try dmesg | tail
-       Silence is golden
-      ...
+#      --- tests/btrfs/255.out 2023-03-02 21:47:53.876609426 +0000
+#      +++ /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad  2023-06-16 10:20:39.267563212 +0100
+#      @@ -1,2 +1,4 @@
+#       QA output created by 255
+#      +ERROR: error during balancing '/home/fdmanana/btrfs-tests/scratch_1': No such file or directory
+#      +There may be more info in syslog - try dmesg | tail
+#       Silence is golden
+#      ...
       (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/255.out /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad'  to see the entire diff)
   Ran: btrfs/255
   Failures: btrfs/255

diff --git a/queue-6.1/btrfs-fix-race-between-quota-disable-and-relocation.patch b/queue-6.1/btrfs-fix-race-between-quota-disable-and-relocation.patch
index 1b8e0b145680f8fbcadd6163de7aec390e80b669..baec68dd53a779b407b627af2cf8e05928e9e51b 100644 (file)
--- a/queue-6.1/btrfs-fix-race-between-quota-disable-and-relocation.patch
+++ b/queue-6.1/btrfs-fix-race-between-quota-disable-and-relocation.patch
@@ -25,14 +25,14 @@ This can be sporadically triggered by test case btrfs/255 from fstests:
 
   btrfs/255 6s ... _check_dmesg: something found in dmesg (see /home/fdmanana/git/hub/xfstests/results//btrfs/255.dmesg)
   - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad)
-      --- tests/btrfs/255.out  2023-03-02 21:47:53.876609426 +0000
-      +++ /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad   2023-06-16 10:20:39.267563212 +0100
-      @@ -1,2 +1,4 @@
-       QA output created by 255
-      +ERROR: error during balancing '/home/fdmanana/btrfs-tests/scratch_1': No such file or directory
-      +There may be more info in syslog - try dmesg | tail
-       Silence is golden
-      ...
+#      --- tests/btrfs/255.out 2023-03-02 21:47:53.876609426 +0000
+#      +++ /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad  2023-06-16 10:20:39.267563212 +0100
+#      @@ -1,2 +1,4 @@
+#       QA output created by 255
+#      +ERROR: error during balancing '/home/fdmanana/btrfs-tests/scratch_1': No such file or directory
+#      +There may be more info in syslog - try dmesg | tail
+#       Silence is golden
+#      ...
       (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/255.out /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad'  to see the entire diff)
   Ran: btrfs/255
   Failures: btrfs/255

diff --git a/queue-6.4/btrfs-fix-race-between-quota-disable-and-relocation.patch b/queue-6.4/btrfs-fix-race-between-quota-disable-and-relocation.patch
index 7ec17e4d5f2b34746b92fba0688be4b65191db8b..a7a7dd2969e98a1da8ded2ad80348c9c2eaecc3e 100644 (file)
--- a/queue-6.4/btrfs-fix-race-between-quota-disable-and-relocation.patch
+++ b/queue-6.4/btrfs-fix-race-between-quota-disable-and-relocation.patch
@@ -25,14 +25,14 @@ This can be sporadically triggered by test case btrfs/255 from fstests:
 
   btrfs/255 6s ... _check_dmesg: something found in dmesg (see /home/fdmanana/git/hub/xfstests/results//btrfs/255.dmesg)
   - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad)
-      --- tests/btrfs/255.out  2023-03-02 21:47:53.876609426 +0000
-      +++ /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad   2023-06-16 10:20:39.267563212 +0100
-      @@ -1,2 +1,4 @@
-       QA output created by 255
-      +ERROR: error during balancing '/home/fdmanana/btrfs-tests/scratch_1': No such file or directory
-      +There may be more info in syslog - try dmesg | tail
-       Silence is golden
-      ...
+#      --- tests/btrfs/255.out 2023-03-02 21:47:53.876609426 +0000
+#      +++ /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad  2023-06-16 10:20:39.267563212 +0100
+#      @@ -1,2 +1,4 @@
+#       QA output created by 255
+#      +ERROR: error during balancing '/home/fdmanana/btrfs-tests/scratch_1': No such file or directory
+#      +There may be more info in syslog - try dmesg | tail
+#       Silence is golden
+#      ...
       (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/255.out /home/fdmanana/git/hub/xfstests/results//btrfs/255.out.bad'  to see the entire diff)
   Ran: btrfs/255
   Failures: btrfs/255