From: Kienan Stewart Date: Mon, 29 Jul 2024 14:14:24 +0000 (+0000) Subject: Fix: block_start removed from btrfs_get_extent in 6.11-rc1 X-Git-Tag: v2.13.15~2 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=708808d6ea066cfa8ea22b5a2afc41fb5c5d484b;p=lttng-modules.git Fix: block_start removed from btrfs_get_extent in 6.11-rc1 See upstream commit: commit c77a8c61002e91d859e118008fd495efbe1d9373 Author: Qu Wenruo Date: Tue Apr 30 07:53:06 2024 +0930 btrfs: remove extent_map::block_start member The member extent_map::block_start can be calculated from extent_map::disk_bytenr + extent_map::offset for regular extents. And otherwise just extent_map::disk_bytenr. And this is already validated by the validate_extent_map(). Now we can remove the member. However there is a special case in btrfs_create_dio_extent() where we for NOCOW/PREALLOC ordered extents cannot directly use the resulting btrfs_file_extent, as btrfs_split_ordered_extent() cannot handle them yet. So for that call site, we pass file_extent->disk_bytenr + file_extent->num_bytes as disk_bytenr for the ordered extent, and 0 for offset. Change-Id: I2e3245bb0d1f5263e902659aa05848d5e231909b Signed-off-by: Kienan Stewart Signed-off-by: Mathieu Desnoyers --- diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h index 28320d83..8fb68669 100644 --- a/include/instrumentation/events/btrfs.h +++ b/include/instrumentation/events/btrfs.h @@ -191,7 +191,6 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent, ctf_integer(u64, ino, btrfs_ino(inode)) ctf_integer(u64, start, map->start) ctf_integer(u64, len, map->len) - ctf_integer(u64, block_start, map->block_start) ctf_integer(unsigned int, flags, map->flags) ctf_integer(int, refs, refcount_read(&map->refs)) ctf_integer(unsigned int, compress_type, extent_map_compression(map))