From 03c7a4980ef363fc58140315f63057b3d6fac8ae Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 31 Jul 2023 09:55:01 +0200 Subject: [PATCH] fix up btrfs patch that quilt chokes on --- ...ce-between-quota-disable-and-relocation.patch | 16 ++++++++-------- ...ce-between-quota-disable-and-relocation.patch | 16 ++++++++-------- ...ce-between-quota-disable-and-relocation.patch | 16 ++++++++-------- ...ce-between-quota-disable-and-relocation.patch | 16 ++++++++-------- ...ce-between-quota-disable-and-relocation.patch | 16 ++++++++-------- 5 files changed, 40 insertions(+), 40 deletions(-) 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 be26edb788f..d7daadcfe13 100644 --- 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 2ab859eb027..3c0598c78ee 100644 --- 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 6b9913f87a2..3d72c763a75 100644 --- 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 1b8e0b14568..baec68dd53a 100644 --- 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 7ec17e4d5f2..a7a7dd2969e 100644 --- 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 -- 2.47.3