From 19ffe1250de9ca616d559a2280d14256de4d7f45 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 3 Apr 2024 18:26:18 +0200 Subject: [PATCH] fix 6.6 btrfs patch to play nice with quilt --- ...hen-detecting-delalloc-ranges-during.patch | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/queue-6.6/btrfs-fix-race-when-detecting-delalloc-ranges-during.patch b/queue-6.6/btrfs-fix-race-when-detecting-delalloc-ranges-during.patch index 42f209b5c74..153e7406801 100644 --- a/queue-6.6/btrfs-fix-race-when-detecting-delalloc-ranges-during.patch +++ b/queue-6.6/btrfs-fix-race-when-detecting-delalloc-ranges-during.patch @@ -66,19 +66,19 @@ The race happens like this: This could actually be sporadically triggered with test case generic/094 from fstests, which reports a missing extent/delalloc range like this: - generic/094 2s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//generic/094.out.bad) - --- tests/generic/094.out 2020-06-10 19:29:03.830519425 +0100 - +++ /home/fdmanana/git/hub/xfstests/results//generic/094.out.bad 2024-02-28 11:00:00.381071525 +0000 - @@ -1,3 +1,9 @@ - QA output created by 094 - fiemap run with sync - fiemap run without sync - +ERROR: couldn't find extent at 7 - +map is 'HHDDHPPDPHPH' - +logical: [ 5.. 6] phys: 301517.. 301518 flags: 0x800 tot: 2 - +logical: [ 8.. 8] phys: 301520.. 301520 flags: 0x800 tot: 1 - ... - (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/generic/094.out /home/fdmanana/git/hub/xfstests/results//generic/094.out.bad' to see the entire diff) +# generic/094 2s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//generic/094.out.bad) +# --- tests/generic/094.out 2020-06-10 19:29:03.830519425 +0100 +# +++ /home/fdmanana/git/hub/xfstests/results//generic/094.out.bad 2024-02-28 11:00:00.381071525 +0000 +# @@ -1,3 +1,9 @@ +# QA output created by 094 +# fiemap run with sync +# fiemap run without sync +# +ERROR: couldn't find extent at 7 +# +map is 'HHDDHPPDPHPH' +# +logical: [ 5.. 6] phys: 301517.. 301518 flags: 0x800 tot: 2 +# +logical: [ 8.. 8] phys: 301520.. 301520 flags: 0x800 tot: 1 +# ... +# (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/generic/094.out /home/fdmanana/git/hub/xfstests/results//generic/094.out.bad' to see the entire diff) So in order to fix this, while still avoiding deadlocks in the case where the fiemap buffer is memory mapped to the same file, change fiemap to work -- 2.47.2