btrfs-tools: upgrade 6.8.1 -> 6.9.2

0001-Add-a-possibility-to-specify-where-python-modules-ar.patch
removed since it's included in 6.9.2

Changelog:
==========
* subvol list: fix accidental trimming of subvolume name
* check: revert checking file extent item 'ram_bytes'
* libbtrfsutil:
   * patchlevel version update 1.3.2
   * fix accidentally closing fd passed to subvolume iterator

(From OE-Core rev: c99dc3e11998597b81919f0d634d1548695e1baf)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 4 insertions, 69 deletions

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch
index 4b1797b65f..ef431cd69a 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-Add-a-possibility-to-specify-where-python-modules-ar.patch
@@ -1,4 +1,4 @@
-From 980f6edc269fa3ef8d4d4b9cd1aada2328131c19 Mon Sep 17 00:00:00 2001
+From 3b9b9b6ac033b44b3864abb1296fce1e19a2b622 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 23 May 2018 21:20:35 +0300
 Subject: [PATCH] Add a possibility to specify where python modules are
@@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 374f59b9..ed083f6b 100644
+index 82dfb1b4..4968989a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -959,7 +959,7 @@ endif
+@@ -984,7 +984,7 @@ endif
  ifeq ($(PYTHON_BINDINGS),1)
  install_python: libbtrfsutil_python
         $(Q)cd libbtrfsutil/python; \
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch
deleted file mode 100644
index 6fefbb2bca..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f9ba9752ba5fd72441bc2018b2453967e75460d4 Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <wangmy@fujitsu.com>
-Date: Mon, 24 Jun 2024 02:00:11 +0000
-Subject: [PATCH] convert: handle rename of inode_includes() from e2fsprogs
- 1.47.1
-
-Upstream-Status: Backport
-[https://kernel.googlesource.com/pub/scm/linux/kernel/git/kdave/btrfs-progs/+/bcb887a4de2c56426a7a7de8d440b6ad75579f10%5E%21/#F0]
-
-Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
----
- configure.ac          |  3 ++-
- convert/source-ext2.c | 11 +++++++++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 007d29b..816dd36 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -312,7 +312,8 @@ AS_IF([test "x$have_ext4_epoch_mask_define" = xno], [
-             AC_DEFINE([EXT4_EPOCH_BITS], [2],[for encode and decode tv_nsec in ext2 inode])
-             AC_DEFINE([EXT4_EPOCH_MASK], [((1U << EXT4_EPOCH_BITS) - 1)], [For encode and decode tv_nsec info in ext2 inode])
-             AC_DEFINE([EXT4_NSEC_MASK],  [(~0UL << EXT4_EPOCH_BITS)], [For encode and decode tv_nsec info in ext2 inode])
--            AC_DEFINE([inode_includes(size, field)],[m4_normalize[(size >= (sizeof(((struct ext2_inode_large *)0)->field) + offsetof(struct ext2_inode_large, field)))]],
-+            # Use name from 1.47.1, backward compatibility is handled in convert/source-ext2.c
-+            AC_DEFINE([ext2fs_inode_includes(size, field)],[m4_normalize[(size >= (sizeof(((struct ext2_inode_large *)0)->field) + offsetof(struct ext2_inode_large, field)))]],
-                 [For encode and decode tv_nsec info in ext2 inode])
-         ],
-         [AC_MSG_WARN([It seems that ext2_inode_large don't includes tv_nsec related info, probably old e2fsprogs, no 64bit time precision of converted images])],
-diff --git a/convert/source-ext2.c b/convert/source-ext2.c
-index 2186b25..bba81e4 100644
---- a/convert/source-ext2.c
-+++ b/convert/source-ext2.c
-@@ -727,10 +727,17 @@ static inline void ext4_decode_extra_time(__le32 * tv_sec, __le32 * tv_nsec,
-         *tv_nsec = (le32_to_cpu(extra) & EXT4_NSEC_MASK) >> EXT4_EPOCH_BITS;
- }
- 
-+/*
-+ * In e2fsprogs < 1.47.1 it's inode_includes, from >= on it's with ext2fs_ prefix.
-+ */
-+#ifndef ext2fs_inode_includes
-+#define ext2fs_inode_includes(size, field)     inode_includes(size, field)
-+#endif
-+
- #define EXT4_COPY_XTIME(xtime, dst, tv_sec, tv_nsec)                                   \
- do {                                                                                   \
-        tv_sec = src->i_ ## xtime ;                                                     \
--       if (inode_includes(inode_size, i_ ## xtime ## _extra)) {                        \
-+       if (ext2fs_inode_includes(inode_size, i_ ## xtime ## _extra)) {                 \
-                tv_sec = src->i_ ## xtime ;                                             \
-                ext4_decode_extra_time(&tv_sec, &tv_nsec, src->i_ ## xtime ## _extra);  \
-                btrfs_set_stack_timespec_sec(&dst->xtime , tv_sec);                     \
-@@ -771,7 +778,7 @@ static int ext4_copy_inode_timespec_extra(struct btrfs_inode_item *dst,
-        EXT4_COPY_XTIME(ctime, dst, tv_sec, tv_nsec);
- 
-        tv_sec = src->i_crtime;
--       if (inode_includes(inode_size, i_crtime_extra)) {
-+       if (ext2fs_inode_includes(inode_size, i_crtime_extra)) {
-                tv_sec = src->i_crtime;
-                ext4_decode_extra_time(&tv_sec, &tv_nsec, src->i_crtime_extra);
-                btrfs_set_stack_timespec_sec(&dst->otime, tv_sec);
--- 
-2.34.1
-
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.9.2.bb
index d61d956a70..9f5586490d 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.8.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.9.2.bb
@@ -17,9 +17,8 @@ DEPENDS = "util-linux zlib"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master;protocol=https \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
-           file://0001-convert-handle-rename-of-inode_includes-from-e2fspro.patch \
            "
-SRCREV = "5d97c32d6f94cf6f473a5f82964e3edaeb1b146e"
+SRCREV = "b0e5ef4cf7c8b473119e0d487a26b96058e8f80d"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \