Accepting request 953027 from home:dsterba:branches:filesystems

- Update to 5.16.1

OBS-URL: https://build.opensuse.org/request/show/953027
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=362

btrfs-progs-kerncompat-add-local-definition-for-alig.patch

@@ -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
-Signed-off-by: David Sterba <dsterba@suse.com>
----
- kerncompat.h | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/kerncompat.h b/kerncompat.h
-index 6ca1526e2014..f0a6e196e3b9 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)
- {
--- 
-2.33.0
-

btrfs-progs-v5.16.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f86cf2c0c53c43173276fd9a1fa5084723411d683d65999fc99feb7482258d3
+size 2872814

btrfs-progs-v5.16.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:22f0cbb4a6f7f05ccfc7053568a0808efc67f98738907e1e0a6be28bec6ba730
-size 2865919

btrfsprogs.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Feb  9 00:00:00 CET 2022 - dsterba@suse.cz
+
+- Update to 5.16.1
+ * mkfs: support DUP on metadata on zoned devices
+ * subvol delete: drop warning for root when search ioctl fails
+ * check:
+   * fix --init-csum-tree to not create checksums for extents that are not
+     supposed to have them
+   * add check for metadata item levels
+ * add udev rule for zoned devices as they require mq-deadline
+ * build: fix redefinition of ALIGN on mixed old/new kernel/userspace (5.11)
+ * other:
+   * typo fixes
+   * new tests
+   * CI targets updated
+ * Removed patches: btrfs-progs-kerncompat-add-local-definition-for-alig.patch (upstream)
+
 -------------------------------------------------------------------
 Wed Jan 19 09:49:19 UTC 2022 - Dirk Müller <dmueller@suse.com>
 

btrfsprogs.spec

@@ -34,7 +34,7 @@
 %define _dracutmodulesdir %(pkg-config --variable dracutmodulesdir dracut)
 
 Name:           btrfsprogs
-Version:        5.16
+Version:        5.16.1
 Release:        0
 Summary:        Utilities for the Btrfs filesystem
 License:        GPL-2.0-only
@@ -53,7 +53,6 @@ Provides:       btrfs-progs = %{version}-%{release}
 Provides:       btrfs-progs(%_arch) = %{version}-%{release}
 
 Patch1:         mkfs-default-features.patch
-Patch2:         btrfs-progs-kerncompat-add-local-definition-for-alig.patch
 
 %if %build_docs
 BuildRequires:  asciidoc
@@ -194,7 +193,6 @@ with Btrfs using libbtrfsutil.
 %prep
 %setup -q -n btrfs-progs-v%{version}
 %patch1 -p1
-%patch2 -p1
 
 %build
 ./autogen.sh
@@ -409,6 +407,7 @@ done
 %defattr(-, root, root)
 %dir %{_udevrulesdir}
 %{_udevrulesdir}/64-btrfs-dm.rules
+%{_udevrulesdir}/64-btrfs-zoned.rules
 %endif
 
 %files -n python-btrfsutil