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

   1 From b845e79532c9c28c0108bf556171093236460251 Mon Sep 17 00:00:00 2001
   2 From: Kienan Stewart <kstewart@efficios.com>
   3 Date: Mon, 29 Jul 2024 14:14:24 +0000
   4 Subject: [PATCH] Fix: block_start removed from btrfs_get_extent in 6.11-rc1
   5
   6 See upstream commit:
   7
   8     commit c77a8c61002e91d859e118008fd495efbe1d9373
   9     Author: Qu Wenruo <wqu@suse.com>
  10     Date:   Tue Apr 30 07:53:06 2024 +0930
  11
  12         btrfs: remove extent_map::block_start member
  13
  14         The member extent_map::block_start can be calculated from
  15         extent_map::disk_bytenr + extent_map::offset for regular extents.
  16         And otherwise just extent_map::disk_bytenr.
  17
  18         And this is already validated by the validate_extent_map().  Now we can
  19         remove the member.
  20
  21         However there is a special case in btrfs_create_dio_extent() where we
  22         for NOCOW/PREALLOC ordered extents cannot directly use the resulting
  23         btrfs_file_extent, as btrfs_split_ordered_extent() cannot handle them
  24         yet.
  25
  26         So for that call site, we pass file_extent->disk_bytenr +
  27         file_extent->num_bytes as disk_bytenr for the ordered extent, and 0 for
  28         offset.
  29
  30 Upstream-Status: Backport
  31
  32 Change-Id: I2e3245bb0d1f5263e902659aa05848d5e231909b
  33 Signed-off-by: Kienan Stewart <kstewart@efficios.com>
  34 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  35 ---
  36  include/instrumentation/events/btrfs.h | 1 -
  37  1 file changed, 1 deletion(-)
  38
  39 diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
  40 index 28320d8..8fb6866 100644
  41 --- a/include/instrumentation/events/btrfs.h
  42 +++ b/include/instrumentation/events/btrfs.h
  43 @@ -191,7 +191,6 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
  44                 ctf_integer(u64, ino, btrfs_ino(inode))
  45                 ctf_integer(u64, start, map->start)
  46                 ctf_integer(u64, len, map->len)
  47 -               ctf_integer(u64, block_start, map->block_start)
  48                 ctf_integer(unsigned int, flags, map->flags)
  49                 ctf_integer(int, refs, refcount_read(&map->refs))
  50                 ctf_integer(unsigned int, compress_type, extent_map_compression(map))