Update to 6.3.1

.gitignore

@@ -122,3 +122,5 @@
 /btrfs-progs-v6.2.1.tar.xz
 /btrfs-progs-v6.2.2.tar.sign
 /btrfs-progs-v6.2.2.tar.xz
+/btrfs-progs-v6.3.1.tar.sign
+/btrfs-progs-v6.3.1.tar.xz

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

@@ -1,7 +1,7 @@
+From 1f0f71dbf865cf57d9e2d28c0c6df49269f651e4 Mon Sep 17 00:00:00 2001
 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
+Subject: [PATCH 1/1] btrfs-progs: mkfs: Enforce 4k sectorsize by default
 
 We have had working subpage support in Btrfs for many cycles now.
 Generally, we do not want people creating filesystems by default
@@ -12,7 +12,6 @@ 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 +++++++++----
@@ -20,7 +19,7 @@ Reviewed-by: Josef Bacik <josef@toxicpanda.com>
  3 files changed, 18 insertions(+), 12 deletions(-)
 
 diff --git a/Documentation/Subpage.rst b/Documentation/Subpage.rst
-index 21a495d5..39ef7d6d 100644
+index 6efea835..3e2d6141 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
@@ -28,14 +27,14 @@ index 21a495d5..39ef7d6d 100644
  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,
+-"-s 4k" option for :command:`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,
++Since v6.4, 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.
++(such as 64KiB with the "-s 64k" option for :command:`mkfs.btrfs`). This
++ensures that new filesystems are compatible across other architecture
++variants using larger page sizes.
  
  Requirements, limitations
  -------------------------
@@ -45,12 +44,12 @@ index 21a495d5..39ef7d6d 100644
 -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.
++for systems with a non-4KiB page size since v6.4.
  
  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
+index 258b7996..6f7ee8ed 100644
 --- a/Documentation/mkfs.btrfs.rst
 +++ b/Documentation/mkfs.btrfs.rst
 @@ -116,10 +116,15 @@ OPTIONS
@@ -69,15 +68,15 @@ index ba7227b3..16abf0ca 100644
 +        page size.
 +
 +        .. note::
-+                Versions prior to 6.3 set the sectorsize matching to the page size.
++                Versions prior to 6.4 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
+index a31b32c6..9c6bd735 100644
 --- a/mkfs/main.c
 +++ b/mkfs/main.c
-@@ -1207,7 +1207,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv)
+@@ -1204,7 +1204,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv)
  	}
  
  	if (!sectorsize)
@@ -87,5 +86,5 @@ index f5e34cbd..5e1834d7 100644
  		goto error;
  
 -- 
-2.39.2
+2.40.0
 

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

@@ -1,4 +1,4 @@
-From 56ea5a3eba4f2048d3e6297a7ab7eb5ef19e2177 Mon Sep 17 00:00:00 2001
+From af78c9cb1893e29490bb7b370081675ca13767eb 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
@@ -12,29 +12,29 @@ has landed in.
  2 files changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/Documentation/Subpage.rst b/Documentation/Subpage.rst
-index 39ef7d6d..a128db95 100644
+index 3e2d6141..7b73dc79 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,
+-Since v6.4, 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
+ (such as 64KiB with the "-s 64k" option for :command:`mkfs.btrfs`). This
+ ensures that new filesystems are compatible across other architecture
 @@ -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 since v6.4.
 +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
+index 6f7ee8ed..a0f5ee6e 100644
 --- a/Documentation/mkfs.btrfs.rst
 +++ b/Documentation/mkfs.btrfs.rst
 @@ -123,9 +123,6 @@ OPTIONS
@@ -42,11 +42,11 @@ index 50d9921a..0f6056a4 100644
          page size.
  
 -        .. note::
--                Versions prior to 6.3 set the sectorsize matching to the page size.
+-                Versions prior to 6.4 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
+2.40.0
 

btrfs-progs.spec

@@ -2,7 +2,7 @@
 %{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}}
 
 Name:           btrfs-progs
-Version:        6.2.2
+Version:        6.3.1
 Release:        1%{?dist}
 Summary:        Userspace programs for btrfs
 
@@ -154,6 +154,9 @@ popd
 %{python3_sitearch}/btrfsutil-*.egg-info/
 
 %changelog
+* Tue May 30 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.3.1-1
+- Update to 6.3.1
+
 * Sun Mar 26 2023 Neal Gompa <ngompa@fedoraproject.org> - 6.2.2-1
 - Update to 6.2.2
 

sources

@@ -1,2 +1,2 @@
-SHA512 (btrfs-progs-v6.2.2.tar.sign) = cd05827dfd66de7eefb0dc9534baacffe7b115fa1f3b2c0d0e7bb280ff47ed9c6308684db2284f65750fb883bbcc2fecb36c09b597f11b07e29d8864b032af33
-SHA512 (btrfs-progs-v6.2.2.tar.xz) = 967e1c1a6b956a4e11a794aad090d1cf370fd98e4186525ccfbbbc9ae3f2bb66ace1d684730f93c558403b7ac1c991aec3d04d07548b19ee1516352a069431db
+SHA512 (btrfs-progs-v6.3.1.tar.sign) = 55cde584d8c10e9029adfabbcdf114f53c63c1181c6ef3ae9ff0356cffdecd18f7251914e5863791db6a5be255dace1f696f887ee4316f83791b59b2638f73e4
+SHA512 (btrfs-progs-v6.3.1.tar.xz) = a567a02f565a44dd06f54b3fd03187d259235eedf8033457368add217c87b2304e8c80ca5e2a35bdffc14e43b6889361183c6dcd5e2f4ad6fe7bfc5eb4127e65