git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From 9bb17e292631f54fb5af4be4fae32ccd3d3d15c7 Mon Sep 17 00:00:00 2001
   2 From: Michael Jeanson <mjeanson@efficios.com>
   3 Date: Mon, 27 May 2024 13:13:15 -0400
   4 Subject: [PATCH 2/3] fix: btrfs: move ->parent and ->ref_root into
   5  btrfs_delayed_ref_node (v6.10)
   6
   7 See upstream commit:
   8
   9   commit cf4f04325b2b27efa5697ba0ea4c1abdee0035b4
  10   Author: Josef Bacik <josef@toxicpanda.com>
  11   Date:   Fri Apr 12 22:57:13 2024 -0400
  12
  13     btrfs: move ->parent and ->ref_root into btrfs_delayed_ref_node
  14
  15     These two members are shared by both the tree refs and data refs, so
  16     move them into btrfs_delayed_ref_node proper.  This allows us to greatly
  17     simplify the comparison code, as the shared refs always only sort on
  18     parent, and the non shared refs always sort first on ref_root, and then
  19     only data refs sort on their specific fields.
  20
  21 Upstream-Status: Backport [9bb17e29 fix: btrfs: move ->parent and ->ref_root into btrfs_delayed_ref_node (v6.10)]
  22
  23 Change-Id: Ib7c92cc4bb8d674ac66ccfa25c03476f7adaaf90
  24 Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
  25 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  26 ---
  27  include/instrumentation/events/btrfs.h | 8 ++++----
  28  1 file changed, 4 insertions(+), 4 deletions(-)
  29
  30 diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
  31 index d73c1ce5..c0c746e2 100644
  32 --- a/include/instrumentation/events/btrfs.h
  33 +++ b/include/instrumentation/events/btrfs.h
  34 @@ -912,8 +912,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_tree_ref,
  35                 ctf_integer(u64, bytenr, ref->bytenr)
  36                 ctf_integer(u64, num_bytes, ref->num_bytes)
  37                 ctf_integer(int, action, ref->action)
  38 -               ctf_integer(u64, parent, ref->tree_ref.parent)
  39 -               ctf_integer(u64, ref_root, ref->tree_ref.root)
  40 +               ctf_integer(u64, parent, ref->parent)
  41 +               ctf_integer(u64, ref_root, ref->ref_root)
  42                 ctf_integer(int, level, ref->tree_ref.level)
  43                 ctf_integer(int, type, ref->type)
  44                 ctf_integer(u64, seq, ref->seq)
  45 @@ -1196,8 +1196,8 @@ LTTNG_TRACEPOINT_EVENT_CLASS(btrfs_delayed_data_ref,
  46                 ctf_integer(u64, bytenr, ref->bytenr)
  47                 ctf_integer(u64, num_bytes, ref->num_bytes)
  48                 ctf_integer(int, action, ref->action)
  49 -               ctf_integer(u64, parent, ref->data_ref.parent)
  50 -               ctf_integer(u64, ref_root, ref->data_ref.root)
  51 +               ctf_integer(u64, parent, ref->parent)
  52 +               ctf_integer(u64, ref_root, ref->ref_root)
  53                 ctf_integer(u64, owner, ref->data_ref.objectid)
  54                 ctf_integer(u64, offset, ref->data_ref.offset)
  55                 ctf_integer(int, type, ref->type)
  56 --
  57 2.39.2
  58