Update to 6.2.2

- Switch to SPDX license identifiers

.cvsignore

@@ -1 +0,0 @@
-btrfs-progs-0.19.tar.bz2

.gitignore

@@ -0,0 +1,124 @@
+/btrfs-progs-*.tar.bz2
+/btrfs-progs-v3.12.tar.xz
+/btrfs-progs-v3.14.tar.xz
+/btrfs-progs-v3.14.1.tar.xz
+/btrfs-progs-v3.14.2.tar.xz
+/btrfs-progs-v3.16.tar.xz
+/btrfs-progs-v3.16.2.tar.xz
+/btrfs-progs-v3.17.tar.xz
+/btrfs-progs-v3.17.2.tar.xz
+/btrfs-progs-v3.17.3.tar.xz
+/btrfs-progs-v3.18.tar.xz
+/btrfs-progs-v3.18.1.tar.xz
+/btrfs-progs-v3.18.2.tar.xz
+/btrfs-progs-v3.19.tar.xz
+/btrfs-progs-v3.19.1.tar.xz
+/btrfs-progs-v4.0.tar.xz
+/btrfs-progs-v4.0.1.tar.xz
+/btrfs-progs-v4.1.tar.xz
+/btrfs-progs-v4.1.2.tar.xz
+/btrfs-progs-v4.2.tar.xz
+/btrfs-progs-v4.2.1.tar.xz
+/btrfs-progs-v4.2.2.tar.xz
+/btrfs-progs-v4.3.1.tar.xz
+/btrfs-progs-v4.4.tar.xz
+/btrfs-progs-v4.4.1.tar.xz
+/btrfs-progs-v4.5.tar.xz
+/btrfs-progs-v4.5.1.tar.xz
+/btrfs-progs-v4.5.2.tar.xz
+/btrfs-progs-v4.5.3.tar.xz
+/btrfs-progs-v4.6.tar.xz
+/btrfs-progs-v4.6.1.tar.xz
+/btrfs-progs-v4.7.tar.xz
+/btrfs-progs-v4.7.1.tar.xz
+/btrfs-progs-v4.7.2.tar.xz
+/btrfs-progs-v4.7.3.tar.xz
+/btrfs-progs-v4.8.tar.xz
+/btrfs-progs-v4.8.1.tar.xz
+/btrfs-progs-v4.8.2.tar.xz
+/btrfs-progs-v4.8.3.tar.xz
+/btrfs-progs-v4.8.4.tar.xz
+/btrfs-progs-v4.8.5.tar.xz
+/btrfs-progs-4.9-1.fc26.src.rpm
+/btrfs-progs-v4.9.tar.xz
+/btrfs-progs-v4.9.1.tar.xz
+/btrfs-progs-v4.10.tar.xz
+/btrfs-progs-v4.10.1.tar.xz
+/btrfs-progs-v4.10.2.tar.xz
+/btrfs-progs-v4.11.tar.xz
+/btrfs-progs-v4.11.1.tar.xz
+/btrfs-progs-v4.12.tar.xz
+/btrfs-progs-v4.12.1.tar.xz
+/btrfs-progs-v4.13.tar.xz
+/btrfs-progs-v4.13.1.tar.xz
+/btrfs-progs-v4.13.2.tar.xz
+/btrfs-progs-v4.13.3.tar.xz
+/btrfs-progs-v4.14.1.tar.xz
+/btrfs-progs-v4.15.1.tar.xz
+/btrfs-progs-v4.16.tar.xz
+/btrfs-progs-v4.17.tar.xz
+/btrfs-progs-v4.17.1.tar.xz
+/btrfs-progs-v4.19.tar.xz
+/btrfs-progs-v4.19.1.tar.xz
+/btrfs-progs-v4.20.2.tar.xz
+/btrfs-progs-v5.1.tar.xz
+/btrfs-progs-v5.2.1.tar.xz
+/btrfs-progs-v5.4.tar.xz
+/btrfs-progs-v5.6.tar.xz
+/btrfs-progs-v5.6.1.tar.xz
+/btrfs-progs-v5.7-rc1.tar.xz
+/btrfs-progs-v5.7.tar.xz
+/btrfs-progs-v5.9.tar.xz
+/btrfs-progs-v5.10-rc1.tar.xz
+/btrfs-progs-v5.10.tar.xz
+/btrfs-progs-v5.11.tar.xz
+/btrfs-progs-v5.11.1.tar.sign
+/btrfs-progs-v5.11.1.tar.xz
+/btrfs-progs-v5.12.tar.sign
+/btrfs-progs-v5.12.tar.xz
+/btrfs-progs-v5.12.1.tar.sign
+/btrfs-progs-v5.12.1.tar.xz
+/btrfs-progs-v5.13.tar.sign
+/btrfs-progs-v5.13.tar.xz
+/btrfs-progs-v5.13.1.tar.sign
+/btrfs-progs-v5.13.1.tar.xz
+/btrfs-progs-v5.14.tar.sign
+/btrfs-progs-v5.14.tar.xz
+/btrfs-progs-v5.14.1.tar.sign
+/btrfs-progs-v5.14.1.tar.xz
+/btrfs-progs-v5.14.2.tar.sign
+/btrfs-progs-v5.14.2.tar.xz
+/btrfs-progs-v5.14.91.tar.sign
+/btrfs-progs-v5.14.91.tar.xz
+/btrfs-progs-v5.15.tar.sign
+/btrfs-progs-v5.15.tar.xz
+/btrfs-progs-v5.15.1.tar.sign
+/btrfs-progs-v5.15.1.tar.xz
+/btrfs-progs-v5.16.tar.sign
+/btrfs-progs-v5.16.tar.xz
+/btrfs-progs-v5.16.1.tar.sign
+/btrfs-progs-v5.16.1.tar.xz
+/btrfs-progs-v5.16.2.tar.sign
+/btrfs-progs-v5.16.2.tar.xz
+/btrfs-progs-v5.18.tar.sign
+/btrfs-progs-v5.18.tar.xz
+/btrfs-progs-v5.19.1.tar.sign
+/btrfs-progs-v5.19.1.tar.xz
+/btrfs-progs-v6.0.tar.sign
+/btrfs-progs-v6.0.tar.xz
+/btrfs-progs-v6.0.1.tar.sign
+/btrfs-progs-v6.0.1.tar.xz
+/btrfs-progs-v6.0.2.tar.sign
+/btrfs-progs-v6.0.2.tar.xz
+/btrfs-progs-v6.1.tar.sign
+/btrfs-progs-v6.1.tar.xz
+/btrfs-progs-v6.1.1.tar.sign
+/btrfs-progs-v6.1.1.tar.xz
+/btrfs-progs-v6.1.2.tar.sign
+/btrfs-progs-v6.1.2.tar.xz
+/btrfs-progs-v6.1.3.tar.sign
+/btrfs-progs-v6.1.3.tar.xz
+/btrfs-progs-v6.2.1.tar.sign
+/btrfs-progs-v6.2.1.tar.xz
+/btrfs-progs-v6.2.2.tar.sign
+/btrfs-progs-v6.2.2.tar.xz

0001-btrfs-progs-mkfs-Enforce-4k-sectorsize-by-default.patch

@@ -0,0 +1,91 @@
+From: Neal Gompa <neal@gompa.dev>
+Subject: [PATCH 1/1] btrfs-progs: mkfs: Enforce 4k sectorsize by default
+Date: Wed, 22 Mar 2023 18:17:14 -0400
+Content-Transfer-Encoding: 8bit
+
+We have had working subpage support in Btrfs for many cycles now.
+Generally, we do not want people creating filesystems by default
+with non-4k sectorsizes since it creates portability problems.
+
+Signed-off-by: Neal Gompa <neal@gompa.dev>
+
+Reviewed-by: Anand Jain <anand.jain@oracle.com>
+Reviewed-by: Qu Wenruo <wqu@suse.com>
+Reviewed-by: Josef Bacik <josef@toxicpanda.com>
+
+---
+ Documentation/Subpage.rst    | 15 ++++++++-------
+ Documentation/mkfs.btrfs.rst | 13 +++++++++----
+ mkfs/main.c                  |  2 +-
+ 3 files changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/Documentation/Subpage.rst b/Documentation/Subpage.rst
+index 21a495d5..39ef7d6d 100644
+--- a/Documentation/Subpage.rst
++++ b/Documentation/Subpage.rst
+@@ -9,17 +9,18 @@ to the exactly same size of the block and page. On x86_64 this is typically
+ pages, like 64KiB on 64bit ARM or PowerPC. This means filesystems created
+ with 64KiB sector size cannot be mounted on a system with 4KiB page size.
+ 
+-While with subpage support, systems with 64KiB page size can create (still needs
+-"-s 4k" option for mkfs.btrfs) and mount filesystems with 4KiB sectorsize,
+-allowing us to push 4KiB sectorsize as default sectorsize for all platforms in the
+-near future.
++Since v6.3, filesystems are created with a 4KiB sectorsize by default,
++though it remains possible to create filesystems with other page sizes
++(such as 64KiB with the "-s 64k" option for mkfs.btrfs). This ensures that
++new filesystems are compatible across other architecture variants using
++larger page sizes.
+ 
+ Requirements, limitations
+ -------------------------
+ 
+-The initial subpage support has been added in v5.15, although it's still
+-considered as experimental at the time of writing (v5.18), most features are
+-already working without problems.
++The initial subpage support has been added in v5.15. Most features are
++already working without problems. Subpage support is used by default
++for systems with a non-4KiB page size since v6.3.
+ 
+ End users can mount filesystems with 4KiB sectorsize and do their usual
+ workload, while should not notice any obvious change, as long as the initial
+diff --git a/Documentation/mkfs.btrfs.rst b/Documentation/mkfs.btrfs.rst
+index ba7227b3..16abf0ca 100644
+--- a/Documentation/mkfs.btrfs.rst
++++ b/Documentation/mkfs.btrfs.rst
+@@ -116,10 +116,15 @@ OPTIONS
+ -s|--sectorsize <size>
+         Specify the sectorsize, the minimum data block allocation unit.
+ 
+-        The default value is the page size and is autodetected. If the sectorsize
+-        differs from the page size, the created filesystem may not be mountable by the
+-        running kernel. Therefore it is not recommended to use this option unless you
+-        are going to mount it on a system with the appropriate page size.
++        By default, the value is 4KiB, but it can be manually set to match the
++        system page size. However, if the sector size is different from the page
++        size, the resulting filesystem may not be mountable by the current
++        kernel, apart from the default 4KiB. Hence, using this option is not
++        advised unless you intend to mount it on a system with the suitable
++        page size.
++
++        .. note::
++                Versions prior to 6.3 set the sectorsize matching to the page size.
+ 
+ -L|--label <string>
+         Specify a label for the filesystem. The *string* should be less than 256
+diff --git a/mkfs/main.c b/mkfs/main.c
+index f5e34cbd..5e1834d7 100644
+--- a/mkfs/main.c
++++ b/mkfs/main.c
+@@ -1207,7 +1207,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv)
+ 	}
+ 
+ 	if (!sectorsize)
+-		sectorsize = (u32)sysconf(_SC_PAGESIZE);
++		sectorsize = (u32)SZ_4K;
+ 	if (btrfs_check_sectorsize(sectorsize))
+ 		goto error;
+ 
+-- 
+2.39.2
+

0002-btrfs-progs-mkfs-doc-Drop-version-change-for-4k-sect.patch

@@ -0,0 +1,52 @@
+From 56ea5a3eba4f2048d3e6297a7ab7eb5ef19e2177 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa@fedoraproject.org>
+Date: Tue, 21 Mar 2023 15:40:15 -0400
+Subject: [PATCH 2/2] btrfs-progs: mkfs: doc: Drop version change for 4k
+ sectorsize
+
+This is not yet upstream so we don't know what version this change
+has landed in.
+---
+ Documentation/Subpage.rst    | 4 ++--
+ Documentation/mkfs.btrfs.rst | 3 ---
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/Documentation/Subpage.rst b/Documentation/Subpage.rst
+index 39ef7d6d..a128db95 100644
+--- a/Documentation/Subpage.rst
++++ b/Documentation/Subpage.rst
+@@ -9,7 +9,7 @@ to the exactly same size of the block and page. On x86_64 this is typically
+ pages, like 64KiB on 64bit ARM or PowerPC. This means filesystems created
+ with 64KiB sector size cannot be mounted on a system with 4KiB page size.
+ 
+-Since v6.3, filesystems are created with a 4KiB sectorsize by default,
++Filesystems are created with a 4KiB sectorsize by default,
+ though it remains possible to create filesystems with other page sizes
+ (such as 64KiB with the "-s 64k" option for mkfs.btrfs). This ensures that
+ new filesystems are compatible across other architecture variants using
+@@ -20,7 +20,7 @@ Requirements, limitations
+ 
+ The initial subpage support has been added in v5.15. Most features are
+ already working without problems. Subpage support is used by default
+-for systems with a non-4KiB page size since v6.3.
++for systems with a non-4KiB page size.
+ 
+ End users can mount filesystems with 4KiB sectorsize and do their usual
+ workload, while should not notice any obvious change, as long as the initial
+diff --git a/Documentation/mkfs.btrfs.rst b/Documentation/mkfs.btrfs.rst
+index 50d9921a..0f6056a4 100644
+--- a/Documentation/mkfs.btrfs.rst
++++ b/Documentation/mkfs.btrfs.rst
+@@ -123,9 +123,6 @@ OPTIONS
+         advised unless you intend to mount it on a system with the suitable
+         page size.
+ 
+-        .. note::
+-                Versions prior to 6.3 set the sectorsize matching to the page size.
+-
+ -L|--label <string>
+         Specify a label for the filesystem. The *string* should be less than 256
+         bytes and must not contain newline characters.
+-- 
+2.39.2
+

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: btrfs-progs
-# $Id: Makefile,v 1.1 2008/06/30 16:26:32 kevin Exp $
-NAME := btrfs-progs
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

btrfs-progs-build-everything.patch

@@ -1,12 +0,0 @@
-diff -up btrfs-progs-0.19/Makefile.orig btrfs-progs-0.19/Makefile
---- btrfs-progs-0.19/Makefile.orig	2009-06-19 08:05:49.151573429 -0400
-+++ btrfs-progs-0.19/Makefile	2009-06-19 08:08:35.192509803 -0400
-@@ -16,7 +16,7 @@ prefix ?= /usr/local
- bindir = $(prefix)/bin
- LIBS=-luuid
- 
--progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck
-+progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck btrfs-image btrfstune
- 
- # make C=1 to enable sparse
- ifdef C

btrfs-progs-build-fixes.patch

@@ -1,32 +0,0 @@
---- btrfs-progs-0.19/btrfsck.c	
-+++ btrfs-progs-0.19/btrfsck.c	
-@@ -21,6 +21,9 @@ 
- #include <stdio.h>
- #include <stdlib.h>
- #include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
- #include "kerncompat.h"
- #include "ctree.h"
- #include "disk-io.h"
---- btrfs-progs-0.19/mkfs.c	
-+++ btrfs-progs-0.19/mkfs.c	
-@@ -341,7 +341,7 @@ int main(int ac, char **av)
- 	u64 alloc_start = 0;
- 	u64 metadata_profile = BTRFS_BLOCK_GROUP_RAID1 | BTRFS_BLOCK_GROUP_DUP;
- 	u64 data_profile = BTRFS_BLOCK_GROUP_RAID0;
--	u32 leafsize = getpagesize();
-+	u32 leafsize = sysconf(_SC_PAGESIZE);
- 	u32 sectorsize = 4096;
- 	u32 nodesize = leafsize;
- 	u32 stripesize = 4096;
-@@ -398,7 +398,7 @@ int main(int ac, char **av)
- 				print_usage();
- 		}
- 	}
--	sectorsize = max(sectorsize, (u32)getpagesize());
-+	sectorsize = max(sectorsize, (u32)sysconf(_SC_PAGESIZE));
- 	if (leafsize < sectorsize || (leafsize & (sectorsize - 1))) {
- 		fprintf(stderr, "Illegal leafsize %u\n", leafsize);
- 		exit(1);

btrfs-progs-fix-labels.patch

@@ -1,25 +0,0 @@
-diff --git a/mkfs.c b/mkfs.c
-index d664254..138bcc9 100644
---- a/mkfs.c
-+++ b/mkfs.c
-@@ -294,7 +294,6 @@ static u64 parse_profile(char *s)
- 
- static char *parse_label(char *input)
- {
--	int i;
- 	int len = strlen(input);
- 
- 	if (len > BTRFS_LABEL_SIZE) {
-@@ -302,12 +301,6 @@ static char *parse_label(char *input)
- 			BTRFS_LABEL_SIZE);
- 		exit(1);
- 	}
--	for (i = 0; i < len; i++) {
--		if (input[i] == '/' || input[i] == '\\') {
--			fprintf(stderr, "invalid label %s\n", input);
--			exit(1);
--		}
--	}
- 	return strdup(input);
- }
- 

btrfs-progs-fix-return-value.patch

@@ -1,32 +0,0 @@
-From 8b6be4c65eda396e0c42182f4ebf2794c62b442c Mon Sep 17 00:00:00 2001
-From: Josef Bacik <josef@redhat.com>
-Date: Tue, 2 Feb 2010 09:51:15 -0500
-Subject: [PATCH] Btrfs-progs: make btrfsctl return values like everybody else
-
-This patch makes btrfsctl return 0 for success and 1 for failure, which is the
-behavior of all other userspace applications.  Thanks,
-
-Signed-off-by: Josef Bacik <josef@redhat.com>
----
- btrfsctl.c |    6 ++----
- 1 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/btrfsctl.c b/btrfsctl.c
-index 66c4e89..73d9c30 100644
---- a/btrfsctl.c
-+++ b/btrfsctl.c
-@@ -231,9 +231,7 @@ int main(int ac, char **av)
- 		printf("ioctl failed with error %d\n", ret);
- 	}
- 	printf("%s\n", BTRFS_BUILD_VERSION);
--	if (ret)
--		exit(0);
--	else
--		exit(1);
-+
-+	return ret ? 1 : 0;
- }
- 
--- 
-1.6.6
-

btrfs-progs-valgrind.patch

@@ -1,247 +0,0 @@
-Hello,
-
-Started running valgrind against btrfsck since e2fsck seemed to have a myriad of
-problems.  btrfsck was actually not in too bad shape, only like 5 or 6 normal
-errors and maybe 5 leaks.  The big leak is the "seen" extent cache that we don't
-seem to do anything with.  Since I'm not sure what Yan is up to I just made it
-so we free that cache before we return in case he wants it for something.  With
-these changes btrfsck doesn't spit out any errors while running valgrind and has
-no leaks.  This should also help any of the other utilities that use the generic
-stuff.  Thanks,
-
-Signed-off-by: Josef Bacik <jbacik@redhat.com>
----
- btrfsck.c      |    2 ++
- disk-io.c      |   29 ++++++++++++++++++-----------
- extent-cache.c |   11 +++++++++++
- extent-cache.h |    1 +
- extent-tree.c  |   10 ++++++++++
- extent_io.c    |    1 +
- volumes.c      |   16 +++++++++++++++-
- volumes.h      |    1 +
- 8 files changed, 59 insertions(+), 12 deletions(-)
-
-diff --git a/btrfsck.c b/btrfsck.c
-index 40c90f8..9dd777f 100644
---- a/btrfsck.c
-+++ b/btrfsck.c
-@@ -2431,6 +2431,8 @@ static int check_extents(struct btrfs_root *root)
- 			break;
- 	}
- 	ret = check_extent_refs(root, &extent_cache);
-+	free_cache_tree(&seen);
-+	free(bits);
- 	return ret;
- }
- 
-diff --git a/disk-io.c b/disk-io.c
-index addebe1..4d4e902 100644
---- a/disk-io.c
-+++ b/disk-io.c
-@@ -425,8 +425,10 @@ static int find_and_setup_log_root(struct btrfs_root *tree_root,
- 	u64 blocknr = btrfs_super_log_root(disk_super);
- 	struct btrfs_root *log_root = malloc(sizeof(struct btrfs_root));
- 
--	if (blocknr == 0)
-+	if (blocknr == 0) {
-+		free(log_root);
- 		return 0;
-+	}
- 
- 	blocksize = btrfs_level_size(tree_root,
- 			     btrfs_super_log_root_level(disk_super));
-@@ -605,7 +607,7 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr,
- 	struct btrfs_root *chunk_root = malloc(sizeof(struct btrfs_root));
- 	struct btrfs_root *dev_root = malloc(sizeof(struct btrfs_root));
- 	struct btrfs_root *csum_root = malloc(sizeof(struct btrfs_root));
--	struct btrfs_fs_info *fs_info = malloc(sizeof(*fs_info));
-+	struct btrfs_fs_info *fs_info = malloc(sizeof(struct btrfs_fs_info));
- 	int ret;
- 	struct btrfs_super_block *disk_super;
- 	struct btrfs_fs_devices *fs_devices = NULL;
-@@ -628,7 +630,7 @@ struct btrfs_root *open_ctree_fd(int fp, const char *path, u64 sb_bytenr,
- 		BUG_ON(ret);
- 	}
- 
--	memset(fs_info, 0, sizeof(*fs_info));
-+	memset(fs_info, 0, sizeof(struct btrfs_fs_info));
- 	fs_info->tree_root = tree_root;
- 	fs_info->extent_root = extent_root;
- 	fs_info->chunk_root = chunk_root;
-@@ -928,15 +930,19 @@ static int close_all_devices(struct btrfs_fs_info *fs_info)
- {
- 	struct list_head *list;
- 	struct list_head *next;
-+	struct list_head *tmp;
- 	struct btrfs_device *device;
- 
--	return 0;
--
- 	list = &fs_info->fs_devices->devices;
--	list_for_each(next, list) {
-+	list_for_each_safe(next, tmp, list) {
- 		device = list_entry(next, struct btrfs_device, dev_list);
- 		close(device->fd);
-+		list_del(&device->dev_list);
-+		free(device->name);
-+		free(device->label);
-+		free(device);
- 	}
-+	free(fs_info->fs_devices);
- 	return 0;
- }
- 
-@@ -970,25 +976,26 @@ int close_ctree(struct btrfs_root *root)
- 	if (fs_info->csum_root->node)
- 		free_extent_buffer(fs_info->csum_root->node);
- 
--	if (root->fs_info->log_root_tree) {
--		if (root->fs_info->log_root_tree->node)
--			free_extent_buffer(root->fs_info->log_root_tree->node);
--		free(root->fs_info->log_root_tree);
-+	if (fs_info->log_root_tree) {
-+		if (fs_info->log_root_tree->node)
-+			free_extent_buffer(fs_info->log_root_tree->node);
- 	}
- 
--	close_all_devices(root->fs_info);
-+	close_all_devices(fs_info);
- 	extent_io_tree_cleanup(&fs_info->extent_cache);
- 	extent_io_tree_cleanup(&fs_info->free_space_cache);
- 	extent_io_tree_cleanup(&fs_info->block_group_cache);
- 	extent_io_tree_cleanup(&fs_info->pinned_extents);
- 	extent_io_tree_cleanup(&fs_info->pending_del);
- 	extent_io_tree_cleanup(&fs_info->extent_ins);
-+	btrfs_mapping_tree_free(&fs_info->mapping_tree);
- 
- 	free(fs_info->tree_root);
- 	free(fs_info->extent_root);
- 	free(fs_info->chunk_root);
- 	free(fs_info->dev_root);
- 	free(fs_info->csum_root);
-+	free(fs_info->log_root_tree);
- 	free(fs_info);
- 
- 	return 0;
-diff --git a/extent-cache.c b/extent-cache.c
-index b871e18..b424975 100644
---- a/extent-cache.c
-+++ b/extent-cache.c
-@@ -170,3 +170,14 @@ void remove_cache_extent(struct cache_tree *tree,
- 	rb_erase(&pe->rb_node, &tree->root);
- }
- 
-+void free_cache_tree(struct cache_tree *tree)
-+{
-+	struct rb_node *node;
-+	struct cache_extent *cache;
-+
-+	while ((node = rb_last(&tree->root)) != NULL) {
-+		cache = rb_entry(node, struct cache_extent, rb_node);
-+		remove_cache_extent(tree, cache);
-+		free(cache);
-+	}
-+}
-diff --git a/extent-cache.h b/extent-cache.h
-index 7f2f2a6..1696bc2 100644
---- a/extent-cache.h
-+++ b/extent-cache.h
-@@ -43,6 +43,7 @@ struct cache_extent *find_cache_extent(struct cache_tree *tree,
- int insert_cache_extent(struct cache_tree *tree, u64 start, u64 size);
- int insert_existing_cache_extent(struct cache_tree *tree,
- 				 struct cache_extent *pe);
-+void free_cache_tree(struct cache_tree *tree);
- 
- static inline int cache_tree_empty(struct cache_tree *tree)
- {
-diff --git a/extent-tree.c b/extent-tree.c
-index b2f9bb2..e1d7ffd 100644
---- a/extent-tree.c
-+++ b/extent-tree.c
-@@ -2985,6 +2985,7 @@ out:
- 
- int btrfs_free_block_groups(struct btrfs_fs_info *info)
- {
-+	struct btrfs_space_info *space_info;
- 	u64 start;
- 	u64 end;
- 	u64 ptr;
-@@ -3008,6 +3009,15 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info)
- 		clear_extent_dirty(&info->free_space_cache, start,
- 				   end, GFP_NOFS);
- 	}
-+
-+	while (!list_empty(&info->space_info)) {
-+		space_info = list_entry(info->space_info.next,
-+					struct btrfs_space_info,
-+					list);
-+		list_del(&space_info->list);
-+		kfree(space_info);
-+	}
-+
- 	return 0;
- }
- 
-diff --git a/extent_io.c b/extent_io.c
-index 069c199..71e6826 100644
---- a/extent_io.c
-+++ b/extent_io.c
-@@ -572,6 +572,7 @@ static struct extent_buffer *__alloc_extent_buffer(struct extent_io_tree *tree,
- 		BUG();
- 		return NULL;
- 	}
-+	memset(eb, 0, sizeof(struct extent_buffer) + blocksize);
- 
- 	eb->start = bytenr;
- 	eb->len = blocksize;
-diff --git a/volumes.c b/volumes.c
-index 7671855..eee66a7 100644
---- a/volumes.c
-+++ b/volumes.c
-@@ -862,6 +862,20 @@ void btrfs_mapping_init(struct btrfs_mapping_tree *tree)
- 	cache_tree_init(&tree->cache_tree);
- }
- 
-+void btrfs_mapping_tree_free(struct btrfs_mapping_tree *tree)
-+{
-+	struct cache_extent *cache;
-+	struct rb_node *node;
-+	struct map_lookup *map;
-+
-+	while ((node = rb_last(&tree->cache_tree.root)) != NULL) {
-+		cache = rb_entry(node, struct cache_extent, rb_node);
-+		map = container_of(cache, struct map_lookup, ce);
-+		remove_cache_extent(&tree->cache_tree, cache);
-+		free(map);
-+	}
-+}
-+
- int btrfs_num_copies(struct btrfs_mapping_tree *map_tree, u64 logical, u64 len)
- {
- 	struct cache_extent *ce;
-@@ -1340,7 +1354,7 @@ int btrfs_read_sys_array(struct btrfs_root *root)
- 	if (!sb)
- 		return -ENOMEM;
- 	btrfs_set_buffer_uptodate(sb);
--	write_extent_buffer(sb, super_copy, 0, BTRFS_SUPER_INFO_SIZE);
-+	write_extent_buffer(sb, super_copy, 0, sizeof(*super_copy));
- 	array_size = btrfs_super_sys_array_size(super_copy);
- 
- 	/*
-diff --git a/volumes.h b/volumes.h
-index bb78751..e466b31 100644
---- a/volumes.h
-+++ b/volumes.h
-@@ -130,4 +130,5 @@ int btrfs_add_system_chunk(struct btrfs_trans_handle *trans,
- 			   struct btrfs_root *root, struct btrfs_key *key,
- 			   struct btrfs_chunk *chunk, int item_size);
- int btrfs_chunk_readonly(struct btrfs_root *root, u64 chunk_offset);
-+void btrfs_mapping_tree_free(struct btrfs_mapping_tree *tree);
- #endif
--- 
-1.5.4.3
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html

btrfs-progs.spec

@@ -1,65 +1,633 @@
+# Local definition of version_no_tilde when it doesn't exist
+%{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}}
+
 Name:           btrfs-progs
-Version:        0.19
+Version:        6.2.2
-Release:        9%{?dist}
+Release:        1%{?dist}
 Summary:        Userspace programs for btrfs
 
-Group:          System Environment/Base
+License:        GPL-2.0-only
-License:        GPLv2
+URL:            https://btrfs.wiki.kernel.org/index.php/Main_Page
-URL:            http://btrfs.wiki.kernel.org/index.php/Main_Page
+Source0:        https://www.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v%{version_no_tilde}.tar.xz
-Source0:        http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/%{name}-%{version}.tar.bz2
+Source1:        https://www.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v%{version_no_tilde}.tar.sign
-Patch0: btrfs-progs-fix-labels.patch
+Source2:        gpgkey-F2B41200C54EFB30380C1756C565D5F9D76D583B.gpg
-Patch1: btrfs-progs-build-everything.patch
-Patch2: btrfs-progs-valgrind.patch
-Patch3: btrfs-progs-fix-return-value.patch
-Patch4: btrfs-progs-build-fixes.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  e2fsprogs-devel, libuuid-devel, zlib-devel, libacl-devel
+# Upstreamable changes
+## From: https://lore.kernel.org/linux-btrfs/20230322221714.2702819-1-neal@gompa.dev/T/#t
+Patch0101:      0001-btrfs-progs-mkfs-Enforce-4k-sectorsize-by-default.patch
+## Fedora specific doc change stacked on top
+Patch0102:      0002-btrfs-progs-mkfs-doc-Drop-version-change-for-4k-sect.patch
 
-%define _root_sbindir /sbin
+
+BuildRequires:  gnupg2
+BuildRequires:  gcc, autoconf, automake, make
+BuildRequires:  git-core
+BuildRequires:  e2fsprogs-devel
+BuildRequires:  libacl-devel, lzo-devel
+BuildRequires:  pkgconfig(blkid)
+BuildRequires:  pkgconfig(uuid)
+BuildRequires:  pkgconfig(zlib)
+BuildRequires:  pkgconfig(libgcrypt) >= 1.8.0
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(libzstd) >= 1.0.0
+BuildRequires:  python3-sphinx
+BuildRequires:  systemd
+BuildRequires:  python3-devel >= 3.4
+BuildRequires:  python3-setuptools
 
 %description
-The btrfs-progs package provides all the userpsace programs needed to create,
+The btrfs-progs package provides all the userspace programs needed to create,
 check, modify and correct any inconsistencies in the btrfs filesystem.
 
+%package -n libbtrfs
+Summary:        btrfs filesystem-specific runtime libraries
+License:        GPL-2.0-only
+# Upstream deprecated this library
+Provides:       deprecated()
+# This was not properly split out before
+Conflicts:      %{name} < 4.20.2
+
+%description -n libbtrfs
+libbtrfs contains the main library used by btrfs
+filesystem-specific programs.
+
+%package -n libbtrfsutil
+Summary:        btrfs filesystem-specific runtime utility libraries
+License:        LGPL-2.1-or-later
+# This was not properly split out before
+Conflicts:      %{name}-devel < 4.20.2
+
+%description -n libbtrfsutil
+libbtrfsutil contains an alternative utility library used by btrfs
+filesystem-specific programs.
+
+%package devel
+Summary:        btrfs filesystem-specific libraries and headers
+# libbtrfsutil is LGPLv2+
+License:        GPL-2.0-only and LGPL-2.1-or-later
+Requires:       %{name} = %{version}-%{release}
+Requires:       libbtrfs%{?_isa} = %{version}-%{release}
+Requires:       libbtrfsutil%{?_isa} = %{version}-%{release}
+
+%description devel
+btrfs-progs-devel contains the libraries and header files needed to
+develop btrfs filesystem-specific programs.
+
+It includes development files for two libraries:
+- libbtrfs (GPLv2)
+- libbtrfsutil (LGPLv2+)
+
+You should install btrfs-progs-devel if you want to develop
+btrfs filesystem-specific programs.
+
+%package -n python3-btrfsutil
+Summary:        Python 3 bindings for libbtrfsutil
+License:        LGPL-2.1-or-later
+Requires:       libbtrfsutil%{?_isa} = %{version}-%{release}
+%{?python_provide:%python_provide python3-btrfsutil}
+
+%description -n python3-btrfsutil
+python3-btrfsutil contains Python 3 bindings to the libbtrfsutil library,
+which can be used for btrfs filesystem-specific programs in Python.
+
+You should install python3-btrfsutil if you want to use or develop
+btrfs filesystem-specific programs in Python.
+
 %prep
-%setup -q
+xzcat '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=-
-%patch0 -p1
+%autosetup -n %{name}-v%{version_no_tilde} -S git_am
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+./autogen.sh
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} convert
+%configure CFLAGS="%{optflags} -fno-strict-aliasing" --with-crypto=libgcrypt --disable-python
+%make_build
+
+pushd libbtrfsutil/python
+%py3_build
+popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%make_install mandir=%{_mandir} bindir=%{_sbindir} libdir=%{_libdir} incdir=%{_includedir}
-make mandir=%{_mandir} bindir=%{_root_sbindir} install DESTDIR=$RPM_BUILD_ROOT
+install -Dpm0644 btrfs-completion %{buildroot}%{_datadir}/bash-completion/completions/btrfs
+# Nuke the static lib
+rm -v %{buildroot}%{_libdir}/*.a
 
-%clean
+pushd libbtrfsutil/python
-rm -rf $RPM_BUILD_ROOT
+%py3_install
+popd
 
 %files
-%defattr(-,root,root,-)
+%license COPYING
-%doc COPYING INSTALL
+%{_sbindir}/btrfsck
-%{_root_sbindir}/btrfsctl
+%{_sbindir}/fsck.btrfs
-%{_root_sbindir}/btrfsck
+%{_sbindir}/mkfs.btrfs
-%{_root_sbindir}/mkfs.btrfs
+%{_sbindir}/btrfs-image
-%{_root_sbindir}/btrfs-debug-tree
+%{_sbindir}/btrfs-convert
-%{_root_sbindir}/btrfs-image
+%{_sbindir}/btrfs-select-super
-%{_root_sbindir}/btrfs-show
+%{_sbindir}/btrfstune
-%{_root_sbindir}/btrfs-vol
+%{_sbindir}/btrfs
-%{_root_sbindir}/btrfs-convert
+%{_sbindir}/btrfs-map-logical
-%{_root_sbindir}/btrfstune
+%{_sbindir}/btrfs-find-root
-%{_mandir}/man8/btrfs-image.8.gz
+%{_mandir}/man5/*
-%{_mandir}/man8/btrfs-show.8.gz
+%{_mandir}/man8/*
-%{_mandir}/man8/btrfsck.8.gz
+%{_udevrulesdir}/64-btrfs-dm.rules
-%{_mandir}/man8/btrfsctl.8.gz
+%{_udevrulesdir}/64-btrfs-zoned.rules
-%{_mandir}/man8/mkfs.btrfs.8.gz
+%{_datadir}/bash-completion/completions/btrfs
+
+%files -n libbtrfs
+%license COPYING
+%{_libdir}/libbtrfs.so.0*
+
+%files -n libbtrfsutil
+%license libbtrfsutil/COPYING
+%{_libdir}/libbtrfsutil.so.1*
+
+%files devel
+%{_includedir}/*
+%{_libdir}/libbtrfs.so
+%{_libdir}/libbtrfsutil.so
+%{_libdir}/pkgconfig/libbtrfsutil.pc
+
+%files -n python3-btrfsutil
+%license libbtrfsutil/COPYING
+%{python3_sitearch}/btrfsutil.*.so
+%{python3_sitearch}/btrfsutil-*.egg-info/
 
 %changelog
+* Sun Mar 26 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.2.2-1
+- Update to 6.2.2
+
+* Wed Mar 22 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.2.1-2
+- Add patch to force default sectorsize to 4k
+
+* Mon Mar 06 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.2.1-1
+- Update to 6.2.1
+
+* Wed Jan 25 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.1.3-1
+- Update to 6.1.3
+- Switch to SPDX license identifiers
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jan 05 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.1.2-1
+- Update to 6.1.2
+
+* Tue Jan 03 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.1.1-1
+- Update to 6.1.1
+
+* Fri Dec 30 2022 Neal Gompa <ngompa@fedoraproject.org> - 6.1-2
+- Add fix to show UUID with "btrfs subvolume list -u"
+
+* Fri Dec 23 2022 Neal Gompa <ngompa@fedoraproject.org> - 6.1-1
+- Update to 6.1
+- Use libgcrypt for cryptographic hash functions
+
+* Fri Nov 25 2022 Neal Gompa <ngompa@fedoraproject.org> - 6.0.2-1
+- Update to 6.0.2
+
+* Fri Nov 04 2022 Igor Raits <ignatenkobrain@fedoraproject.org> - 6.0.1-1
+- Update to 6.0.1
+
+* Thu Oct 13 2022 Neal Gompa <ngompa@fedoraproject.org> - 6.0-1
+- Update to 6.0
+
+* Thu Oct 13 2022 Neal Gompa <ngompa@fedoraproject.org> - 5.19.1-1
+- Update to 5.19.1
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 5.18-2
+- Rebuilt for Python 3.11
+
+* Wed May 25 2022 Neal Gompa <ngompa@fedoraproject.org> - 5.18-1
+- Update to 5.18
+
+* Wed Feb 16 2022 Neal Gompa <ngompa@fedoraproject.org> - 5.16.2-1
+- Update to 5.16.2
+
+* Sat Feb 05 2022 Igor Raits <igor.raits@gmail.com> - 5.16.1-1
+- Update to 5.16.1
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Jan 17 2022 Neal Gompa <ngompa@fedoraproject.org> - 5.16-1
+- Update to 5.16
+
+* Mon Nov 22 2021 Neal Gompa <ngompa@fedoraproject.org> - 5.15.1-1
+- Update to 5.15.1
+
+* Fri Nov 05 2021 Neal Gompa <ngompa@fedoraproject.org> - 5.15-1
+- Update to 5.15
+
+* Sat Oct 30 2021 Neal Gompa <ngompa@fedoraproject.org> - 5.14.91-1
+- Update to 5.14.91 (5.15~rc1)
+
+* Sat Oct 09 2021 Neal Gompa <ngompa@fedoraproject.org> - 5.14.2-1
+- Update to 5.14.2
+
+* Mon Sep 20 2021 Neal Gompa <ngompa@fedoraproject.org> - 5.14.1-1
+- Update to 5.14.1
+
+* Fri Sep 10 2021 Neal Gompa <ngompa@fedoraproject.org> - 5.14-2
+- Mark libbtrfs as deprecated, per upstream release notes
+
+* Fri Sep 10 2021 Neal Gompa <ngompa@fedoraproject.org> - 5.14-1
+- Update to 5.14
+
+* Fri Jul 30 2021 Neal Gompa <ngompa@fedoraproject.org> - 5.13.1-1
+- Update to 5.13.1
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jul 13 2021 Neal Gompa <ngompa@fedoraproject.org> - 5.13-1
+- Update to 5.13
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 5.12.1-2
+- Rebuilt for Python 3.10
+
+* Thu May 13 2021 Neal Gompa <ngompa13@gmail.com> - 5.12.1-1
+- Update to 5.12.1
+
+* Mon May 10 2021 Neal Gompa <ngompa13@gmail.com> - 5.12-1
+- Update to 5.12
+
+* Sun Mar 28 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 5.11.1-1
+- Update to 5.11.1
+
+* Fri Mar 05 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 5.11-1
+- Update to 5.11
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 19 2021 Neal Gompa <ngompa13@gmail.com> - 5.10-1
+- New upstream release
+
+* Fri Jan 15 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 5.10~rc1-1
+- Update to 5.10-rc1
+
+* Fri Oct 23 2020 Neal Gompa <ngompa13@gmail.com> - 5.9-1
+- New upstream release
+- Build Python bindings
+- Drop patches incorporated into this release
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 24 2020 Neal Gompa <ngompa13@gmail.com> - 5.7-4
+- Backport fix for converting 64-bit ext4 filesystems (#1851674)
+
+* Tue Jul 21 2020 Neal Gompa <ngompa13@gmail.com> - 5.7-3
+- Backport fix to not use raid0 by default for mkfs multi-disk (#1855174)
+
+* Wed Jul 08 2020 Carl George <carl@george.computer> - 5.7-2
+- Include bash completion
+
+* Thu Jul 02 2020 Neal Gompa <ngompa13@gmail.com> - 5.7-1
+- New upstream release
+
+* Tue Jun 30 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 5.7~rc1-1
+- Update to 5.7-rc1
+
+* Mon Jun 15 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 5.6.1-2
+- Rebuild
+
+* Mon Jun 08 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 5.6.1-1
+- Update to 5.6.1
+
+* Sun Apr 05 2020 Neal Gompa <ngompa13@gmail.com> - 5.6-1
+- New upstream release
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Dec 06 2019 Neal Gompa <ngompa13@gmail.com> - 5.4-1
+- New upstream release
+
+* Sat Aug 24 2019 Neal Gompa <ngompa13@gmail.com> - 5.2.1-1
+- New upstream release
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu May 30 2019 Neal Gompa <ngompa13@gmail.com> - 5.1-1
+- New upstream release
+
+* Sun Mar 10 2019 Neal Gompa <ngompa13@gmail.com> - 4.20.2-1
+- New upstream release
+- Properly split out libraries into libs subpackages
+- Slightly modernize the spec
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.19.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Dec 05 2018 Eric Sandeen <sandeen@redhat.com> 4.19.-1
+- New usptream release
+
+* Mon Aug 06 2018 Eric Sandeen <sandeen@redhat.com> 4.17.1-1
+- New upstream release
+
+* Mon Jul 23 2018 Eric Sandeen <sandeen@redhat.com> 4.17-1
+- New upstream release
+- Removes deprecated btrfs-debug-tree, btrfs-zero-log
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.16-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 4.16-3
+- Rebuilt for Python 3.7
+
+* Sun Apr 08 2018 Eric Sandeen <sandeen@redhat.com> 4.16-2
+- Fix up header install paths in devel package (#1564881)
+
+* Fri Apr 06 2018 Eric Sandeen <sandeen@redhat.com> 4.16-1
+- New upstream release
+
+* Mon Feb 26 2018 Eric Sandeen <sandeen@redhat.com> 4.15.1-2
+- BuildRequires: gcc
+
+* Fri Feb 16 2018 Eric Sandeen <sandeen@redhat.com> 4.15.1-1
+- New upstream release
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.14.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 05 2018 Eric Sandeen <sandeen@redhat.com> 4.14.1-1
+- New upstream release
+
+* Tue Oct 17 2017 Eric Sandeen <sandeen@redhat.com> 4.13.3-1
+- New upstream release
+
+* Fri Oct 06 2017 Eric Sandeen <sandeen@redhat.com> 4.13.2-1
+- New upstream release
+
+* Tue Sep 26 2017 Eric Sandeen <sandeen@redhat.com> 4.13.1-1
+- New upstream release
+
+* Fri Sep 08 2017 Eric Sandeen <sandeen@redhat.com> 4.13-1
+- New upstream release
+
+* Mon Aug 28 2017 Eric Sandeen <sandeen@redhat.com> 4.12.1-1
+- New upstream release
+
+* Mon Jul 31 2017 Eric Sandeen <sandeen@redhat.com> 4.12-1
+- New upstream release
+
+* Mon Jul 31 2017 Igor Gnatenko <ignatenko@redhat.com> - 4.11.1-3
+- Add missing BuildRequires: systemd
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jul 03 2017 Eric Sandeen <sandeen@redhat.com> 4.11.1-1
+- New upstream release
+
+* Thu May 18 2017 Eric Sandeen <sandeen@redhat.com> 4.11-1
+- New upstream release
+
+* Wed May 03 2017 Eric Sandeen <sandeen@redhat.com> 4.10.2-1
+- New upstream release
+
+* Fri Mar 17 2017 Eric Sandeen <sandeen@redhat.com> 4.10.1-1
+- New upstream release
+
+* Wed Mar 8 2017 Eric Sandeen <sandeen@redhat.com> 4.10-1
+- New upstream release
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Jan 27 2017 Eric Sandeen <sandeen@redhat.com> 4.9.1-1
+- New upstream release
+
+* Wed Jan 25 2017 Eric Sandeen <sandeen@redhat.com> 4.9-2
+- Remove unapplied patches
+
+* Fri Dec 23 2016 Eric Sandeen <sandeen@redhat.com> 4.9-1
+- New upstream release
+
+* Wed Nov 30 2016 Eric Sandeen <sandeen@redhat.com> 4.8.5-1
+- New upstream release
+
+* Fri Nov 25 2016 Eric Sandeen <sandeen@redhat.com> 4.8.4-1
+- New upstream release
+- btrfs-show-super removed (deprecated upstream)
+
+* Sat Nov 12 2016 Eric Sandeen <sandeen@redhat.com> 4.8.3-1
+- New upstream release
+
+* Fri Oct 28 2016 Eric Sandeen <sandeen@redhat.com> 4.8.2-2
+- Remove ioctl patch, different fix upstream
+
+* Thu Oct 13 2016 Eric Sandeen <sandeen@redhat.com> 4.8.1-2
+- Fix build of apps including ioctl.h (bz#1384413)
+
+* Wed Oct 12 2016 Eric Sandeen <sandeen@redhat.com> 4.8.1-1
+- New upstream release
+
+* Wed Oct 12 2016 Eric Sandeen <sandeen@redhat.com> 4.8-1
+- New upstream release (FTBFS on 32-bit)
+
+* Wed Sep 21 2016 Eric Sandeen <sandeen@redhat.com> 4.7.3-1
+- New upstream release
+
+* Mon Sep 05 2016 Eric Sandeen <sandeen@redhat.com> 4.7.2-1
+- New upstream release
+
+* Sat Aug 27 2016 Eric Sandeen <sandeen@redhat.com> 4.7.1-1
+- New upstream release
+
+* Mon Aug 01 2016 Eric Sandeen <sandeen@redhat.com> 4.7-1
+- New upstream release
+
+* Fri Jun 24 2016 Eric Sandeen <sandeen@redhat.com> 4.6.1-1
+- New upstream release
+
+* Wed Jun 15 2016 Eric Sandeen <sandeen@redhat.com> 4.6-1
+- New upstream release
+
+* Fri May 13 2016 Eric Sandeen <sandeen@redhat.com> 4.5.3-1
+- New upstream release
+
+* Mon May 02 2016 Eric Sandeen <sandeen@redhat.com> 4.5.2-1
+- New upstream release
+
+* Thu Mar 31 2016 Eric Sandeen <sandeen@redhat.com> 4.5.1-1
+- New upstream release
+
+* Wed Mar 30 2016 Eric Sandeen <sandeen@redhat.com> 4.5-1
+- New upstream release
+
+* Fri Feb 26 2016 Eric Sandeen <sandeen@redhat.com> 4.4.1-1
+- New upstream release
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jan 25 2016 Eric Sandeen <sandeen@redhat.com> 4.4-1
+- New upstream release
+
+* Wed Nov 18 2015 Eric Sandeen <sandeen@redhat.com> 4.3.1-1
+- New upstream release
+
+* Thu Oct 08 2015 Eric Sandeen <sandeen@redhat.com> 4.2.2-1
+- New upstream release
+
+* Tue Sep 22 2015 Eric Sandeen <sandeen@redhat.com> 4.2.1-1
+- New upstream release
+
+* Thu Sep 03 2015 Eric Sandeen <sandeen@redhat.com> 4.2-1
+- New upstream release
+
+* Thu Aug 06 2015 Eric Sandeen <sandeen@redhat.com> 4.1.2-1
+- New upstream release
+- Fix to reject unknown mkfs options (#1246468)
+
+* Mon Jun 22 2015 Eric Sandeen <sandeen@redhat.com> 4.1-1
+- New upstream release
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed May 20 2015 Eric Sandeen <sandeen@redhat.com> 4.0.1-1
+- New upstream release
+
+* Wed Apr 29 2015 Eric Sandeen <sandeen@redhat.com> 4.0-1
+- New upstream release
+
+* Thu Mar 26 2015 Eric Sandeen <sandeen@redhat.com> 3.19.1-1
+- New upstream release
+
+* Wed Mar 11 2015 Eric Sandeen <sandeen@redhat.com> 3.19-1
+- New upstream release
+
+* Tue Jan 27 2015 Eric Sandeen <sandeen@redhat.com> 3.18.2-1
+- New upstream release
+
+* Mon Jan 12 2015 Eric Sandeen <sandeen@redhat.com> 3.18.1-1
+- New upstream release
+
+* Fri Jan 02 2015 Eric Sandeen <sandeen@redhat.com> 3.18-1
+- New upstream release
+
+* Fri Dec 05 2014 Eric Sandeen <sandeen@redhat.com> 3.17.3-1
+- New upstream release
+
+* Fri Nov 21 2014 Eric Sandeen <sandeen@redhat.com> 3.17.2-1
+- New upstream release
+
+* Mon Oct 20 2014 Eric Sandeen <sandeen@redhat.com> 3.17-1
+- New upstream release
+
+* Fri Oct 03 2014 Eric Sandeen <sandeen@redhat.com> 3.16.2-1
+- New upstream release
+- Update upstream source location
+
+* Wed Aug 27 2014 Eric Sandeen <sandeen@redhat.com> 3.16-1
+- New upstream release
+
+* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.14.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Mon Jun 16 2014 Eric Sandeen <sandeen@redhat.com> 3.14.2-3
+- Support specification of UUID at mkfs time (#1094857)
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.14.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri May 30 2014 Eric Sandeen <sandeen@redhat.com> 3.14.2-1
+- New upstream release
+
+* Tue Apr 22 2014 Eric Sandeen <sandeen@redhat.com> 3.14.1-1
+- New upstream release
+
+* Wed Apr 16 2014 Eric Sandeen <sandeen@redhat.com> 3.14-1
+- New upstream release
+
+* Mon Jan 20 2014 Eric Sandeen <sandeen@redhat.com> 3.12-2
+- Add proper Source0 URL, switch to .xz
+
+* Mon Nov 25 2013 Eric Sandeen <sandeen@redhat.com> 3.12-1
+- It's a new upstream release!
+
+* Thu Nov 14 2013 Eric Sandeen <sandeen@redhat.com> 0.20.rc1.20131114git9f0c53f-1
+- New upstream snapshot
+
+* Tue Sep 17 2013 Eric Sandeen <sandeen@redhat.com> 0.20.rc1.20130917git194aa4a-1
+- New upstream snapshot
+- Deprecated btrfsctl, btrfs-show, and btrfs-vol; still available in btrfs cmd
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.20.rc1.20130501git7854c8b-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon May 13 2013 Richard W.M. Jones <rjones@redhat.com> 0.20.rc1.20130501git7854c8b-3
+- Add accepted upstream patch to fix SONAME libbtrfs.so -> libbtrfs.so.0
+
+* Thu May 02 2013 Eric Sandeen <sandeen@redhat.com> 0.20.rc1.20130501git7854c8b-2
+- Fix subpackage brokenness
+
+* Wed May 01 2013 Eric Sandeen <sandeen@redhat.com> 0.20.rc1.20130501git7854c8b-1
+- New upstream snapshot
+- btrfs-progs-devel subpackage
+
+* Fri Mar 08 2013 Eric Sandeen <sandeen@redhat.com> 0.20.rc1.20130308git704a08c-1
+- New upstream snapshot
+- btrfs-restore is now a command in the btrfs utility
+
+* Wed Feb 13 2013 Richard W.M. Jones <rjones@redhat.com> 0.20.rc1.20121017git91d9eec-3
+- Include upstream patch to clear caches as a partial fix for RHBZ#863978.
+
+* Thu Nov  1 2012 Josef Bacik <josef@toxicpanda.com> 0.20.rc1.20121017git91d9eec-2
+- fix a bug when mkfs'ing a file (rhbz# 871778)
+
+* Wed Oct 17 2012 Josef Bacik <josef@toxicpanda.com> 0.20.rc1.20121017git91d9eec-1
+- update to latest btrfs-progs
+
+* Wed Oct 10 2012 Richard W.M. Jones <rjones@redhat.com> 0.19.20120817git043a639-2
+- Add upstream patch to correct uninitialized fsid variable
+  (possible fix for RHBZ#863978).
+
+* Fri Aug 17 2012 Josef Bacik <josef@toxicpanda.com> 0.19.20120817git043a639-1
+- update to latest btrfs-progs
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Apr 25 2012 Josef Bacik <josef@toxicpanda.com> 0.19-19
+- make btrfs filesystem show <uuid> actually work (rhbz# 816293)
+
+* Wed Apr 11 2012 Josef Bacik <josef@toxicpanda.com> 0.19-18
+- updated to latest btrfs-progs
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Aug 05 2011 Josef Bacik <josef@toxicpanda.com> 0.19-16
+- fix build-everything patch to actually build everything
+
+* Fri Aug 05 2011 Josef Bacik <josef@toxicpanda.com> 0.19-15
+- actually build btrfs-zero-log
+
+* Thu Aug 04 2011 Josef Bacik <josef@toxicpanda.com> 0.19-14
+- bring btrfs-progs uptodate with upstream
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.19-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Aug 20 2010 Adam Tkac <atkac redhat com> 0.19-12
+- rebuild to ensure F14 has bigger NVR than F13
+
+* Wed Mar 24 2010 Josef Bacik <josef@toxicpanda.com> 0.19-11
+- bring btrfs-progs uptodate with upstream, add btrfs command and other
+  features.
+
+* Thu Mar 11 2010 Josef Bacik <josef@toxicpanda.com> 0.19-10
+- fix dso linking issue and bring btrfs-progs uptodate with upstream
+
 * Tue Feb 2 2010 Josef Bacik <josef@toxicpanda.com> 0.19-9
 - fix btrfsck so it builds on newer glibcs
 
@@ -114,7 +682,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Jan 10 2009 Marek Mahut <mmahut@fedoraproject.org> 0.16-1
 - Upstream release 0.16
 
-* Mon Jun 25 2008 Josef Bacik <josef@toxicpanda.com> 0.15-4
+* Wed Jun 25 2008 Josef Bacik <josef@toxicpanda.com> 0.15-4
 -use fedoras normal CFLAGS
 
 * Mon Jun 23 2008 Josef Bacik <josef@toxicpanda.com> 0.15-3

import.log

@@ -1 +0,0 @@
-btrfs-progs-0_15-4_fc8:HEAD:btrfs-progs-0.15-4.fc8.src.rpm:1214853686

sources

@@ -1 +1,2 @@
-5854728d080cc76f21a83bdc99b6ddaa  btrfs-progs-0.19.tar.bz2
+SHA512 (btrfs-progs-v6.2.2.tar.sign) = cd05827dfd66de7eefb0dc9534baacffe7b115fa1f3b2c0d0e7bb280ff47ed9c6308684db2284f65750fb883bbcc2fecb36c09b597f11b07e29d8864b032af33
+SHA512 (btrfs-progs-v6.2.2.tar.xz) = 967e1c1a6b956a4e11a794aad090d1cf370fd98e4186525ccfbbbc9ae3f2bb66ace1d684730f93c558403b7ac1c991aec3d04d07548b19ee1516352a069431db