Update to 6.5.1

This commit is contained in:
Neal Gompa 2023-09-14 16:51:00 -04:00
parent 25a2c63781
commit 79b7d24868
5 changed files with 42 additions and 32 deletions

2
.gitignore vendored
View File

@ -128,3 +128,5 @@
/btrfs-progs-v6.3.2.tar.xz
/btrfs-progs-v6.3.3.tar.sign
/btrfs-progs-v6.3.3.tar.xz
/btrfs-progs-v6.5.1.tar.sign
/btrfs-progs-v6.5.1.tar.xz

View File

@ -1,4 +1,4 @@
From a73a401d3140e5585b734b908068c2eaf597204a Mon Sep 17 00:00:00 2001
From 4d8199f0e3d30be69ebd10820d5402ec8d326e38 Mon Sep 17 00:00:00 2001
From: Neal Gompa <neal@gompa.dev>
Date: Wed, 22 Mar 2023 18:17:14 -0400
Subject: [PATCH 1/1] btrfs-progs: mkfs: Enforce 4k sectorsize by default
@ -13,22 +13,23 @@ 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 | 12 ++++++++----
Documentation/Subpage.rst | 17 +++++++++--------
Documentation/mkfs.btrfs.rst | 13 +++++++++----
mkfs/main.c | 2 +-
3 files changed, 18 insertions(+), 9 deletions(-)
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/Documentation/Subpage.rst b/Documentation/Subpage.rst
index bd1b41a8..62f2f924 100644
index c762b6a3..4bcfc6cf 100644
--- a/Documentation/Subpage.rst
+++ b/Documentation/Subpage.rst
@@ -9,14 +9,18 @@ to the exactly same size of the block and page. On x86_64 this is typically
@@ -9,18 +9,19 @@ 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 :command:`mkfs.btrfs`) and mount filesystems with 4KiB sectorsize.
+Since v6.4, filesystems are created with a 4KiB sectorsize by default,
-While with subpage support systems with 64KiB page size can create
-and mount filesystems with 4KiB sectorsize. This still needs to use option "-s
-4k" option for :command:`mkfs.btrfs`.
+Since v6.5, 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 :command:`mkfs.btrfs`). This
+ensures that new filesystems are compatible across other architecture
@ -39,17 +40,21 @@ index bd1b41a8..62f2f924 100644
-The initial subpage support has been added in v5.15, although it's still
-considered as experimental, most features are already working without problems.
-On a 64KiB page system filesystem with 4KiB sectorsize can be mounted and used
-as usual as long as the initial mount succeeds. There are cases a mount will be
-rejected when verifying compatible features.
+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.4.
+already working without problems. On a 64KiB page system, a filesystem with
+4KiB sectorsize can be mounted and used as long as the initial mount succeeds.
+Subpage support is used by default for systems with a non-4KiB page size since v6.5.
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
Please refer to status page of :ref:`status-subpage-block-size` for
compatibility.
diff --git a/Documentation/mkfs.btrfs.rst b/Documentation/mkfs.btrfs.rst
index d1626f73..47b8b05e 100644
index 1fca7448..d602fe9c 100644
--- a/Documentation/mkfs.btrfs.rst
+++ b/Documentation/mkfs.btrfs.rst
@@ -120,10 +120,15 @@ OPTIONS
@@ -122,10 +122,15 @@ OPTIONS
-s|--sectorsize <size>
Specify the sectorsize, the minimum data block allocation unit.
@ -70,7 +75,7 @@ index d1626f73..47b8b05e 100644
-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 7acd39ec..5bac164d 100644
index 1c5d668e..bd2e4350 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -1204,7 +1204,7 @@ int BOX_MAIN(mkfs)(int argc, char **argv)
@ -83,5 +88,5 @@ index 7acd39ec..5bac164d 100644
goto error;
--
2.40.0
2.41.0

View File

@ -1,4 +1,4 @@
From ec4bcc45d5179aa30ae62dd95da7cead0613e0bd Mon Sep 17 00:00:00 2001
From 692f223b5a152951d38d2dcf9103d28b2185626c 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,32 +12,32 @@ has landed in.
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/Documentation/Subpage.rst b/Documentation/Subpage.rst
index 62f2f924..4617fad4 100644
index 4bcfc6cf..698085bd 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.4, filesystems are created with a 4KiB sectorsize by default,
-Since v6.5, 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 :command:`mkfs.btrfs`). This
ensures that new filesystems are compatible across other architecture
@@ -20,7 +20,7 @@ Requirements, limitations
@@ -21,7 +21,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.4.
+for systems with a non-4KiB page size.
already working without problems. On a 64KiB page system, a filesystem with
4KiB sectorsize can be mounted and used as long as the initial mount succeeds.
-Subpage support is used by default for systems with a non-4KiB page size since v6.5.
+Subpage support is used by default 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
Please refer to status page of :ref:`status-subpage-block-size` for
compatibility.
diff --git a/Documentation/mkfs.btrfs.rst b/Documentation/mkfs.btrfs.rst
index 47b8b05e..b7bc80f2 100644
index d602fe9c..11ac4af2 100644
--- a/Documentation/mkfs.btrfs.rst
+++ b/Documentation/mkfs.btrfs.rst
@@ -127,9 +127,6 @@ OPTIONS
@@ -129,9 +129,6 @@ OPTIONS
advised unless you intend to mount it on a system with the suitable
page size.
@ -48,5 +48,5 @@ index 47b8b05e..b7bc80f2 100644
Specify a label for the filesystem. The *string* should be less than 256
bytes and must not contain newline characters.
--
2.40.0
2.41.0

View File

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

View File

@ -1,2 +1,2 @@
SHA512 (btrfs-progs-v6.3.3.tar.sign) = 4dfa1d780186bc72b65b4d440f52dfad9a8894d6f48e408bf55beab551a085da2fbb9cadb475fab6ab870cae58355884ee611343fed5a551b9e4ad63d85ae7fd
SHA512 (btrfs-progs-v6.3.3.tar.xz) = e72791fd91cc9a93aaab72bf8c36f9d7e2608315ccb3b0474ca0c1e1893465b2c7145ce523216accb0d02c4dd0fd13597702ce6a8b9c2ac137cd9bce3c5a4347
SHA512 (btrfs-progs-v6.5.1.tar.sign) = e335a82914b673b2b073304e82906e9c646d6e0aafe0f01ac294981714b2538af4cf17c81d2d521c1d8a2bfb81507af58a50bfa9897f78ea2e36f460bf7de253
SHA512 (btrfs-progs-v6.5.1.tar.xz) = 87cc81ecad0cb22de3086fef0fd825be101344d44dc954ac05e25d394421ca5fe3dbcb27c79a3a8fb67a2d3237b7bd84329ccef2c070b1b07d1156dc08716dfb