btrfs-tools: upgrade 5.16 -> 5.16.2

0001-btrfs-progs-kerncompat-add-local-definition-for-alig.patch
removed since it's included in 5.16.2

Changelog:
=========
mkfs: fix detection of profile type for zoned mode when creating DUP
build:
 - add missing stub for zoned mode helper when zoned mode not enabled
 - fix 64bit types on MIPS and PowerPC
 - improved zoned mode support autodetection, for systems with existing blkzone.h
   header but missing support for zone capacity
other: doc updates, test updates

(From OE-Core rev: ec04580374ed6cc26471a338f84794f41931eca1)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
wangmy 2022-03-04 13:18:43 +08:00 committed by Richard Purdie
parent bf6ce6ecc8
commit 73f25a3ede
2 changed files with 1 additions and 48 deletions

View File

@ -1,46 +0,0 @@
From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Thu, 13 Jan 2022 14:47:08 +0100
Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment
macros
There's still problem left with compilation on musl and kernel < 5.11,
because __ALIGN_KERNEL is not defined anymore:
../bin/ld: kernel-shared/volumes.o: in function `create_chunk':
volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL'
Due to the entangled includes and unconditional definition of
__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it
eventually (as kerncompat.h is the first include). Instead add local
definitions of the macros and rename them to avoid name clashes.
Pull-request: #433
Upstream-Status: Backport [https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58]
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
kerncompat.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/kerncompat.h b/kerncompat.h
index 6ca1526e2..f0a6e196e 100644
--- a/kerncompat.h
+++ b/kerncompat.h
@@ -359,7 +359,14 @@ do { \
/* Alignment check */
#define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0)
-#define ALIGN(x, a) __ALIGN_KERNEL((x), (a))
+
+/*
+ * Alignment, copied and renamed from /usr/include/linux/const.h to work around
+ * issues caused by moving the definition in 5.12
+ */
+#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1)
+#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask))
+#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a))
static inline int is_power_of_2(unsigned long n)
{

View File

@ -17,9 +17,8 @@ DEPENDS = "lzo util-linux zlib"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master \
file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
file://0001-btrfs-progs-kerncompat-add-local-definition-for-alig.patch \
"
SRCREV = "8ad326b2f28c044cb6ed9016d7c3285e23b673c8"
SRCREV = "31458c9c81935abbed010221261897273a98d2c1"
S = "${WORKDIR}/git"
PACKAGECONFIG ??= " \