From ae2607f01609745e3137fa7494c09af10f41afc0 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Jan 15 2022 18:26:58 +0000 Subject: Update to 5.14.2 --- diff --git a/SOURCES/1001-balance-mkfs-Disable-raid56-modes.patch b/SOURCES/1001-balance-mkfs-Disable-raid56-modes.patch index eb86c2b..fd11f19 100644 --- a/SOURCES/1001-balance-mkfs-Disable-raid56-modes.patch +++ b/SOURCES/1001-balance-mkfs-Disable-raid56-modes.patch @@ -1,4 +1,4 @@ -From 9a260cc0355661947dbba6929412662ed6d71d31 Mon Sep 17 00:00:00 2001 +From 349ea14a32ab63555cff47440f178ed01870e3f6 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 1 Sep 2021 19:25:55 -0400 Subject: [PATCH] balance, mkfs: Disable raid56 modes @@ -8,15 +8,15 @@ so it is disabled. Signed-off-by: Neal Gompa --- - cmds/balance.c | 37 +++++-------------------------------- + cmds/balance.c | 35 ++++------------------------------- mkfs/main.c | 4 ++-- - 2 files changed, 7 insertions(+), 34 deletions(-) + 2 files changed, 6 insertions(+), 33 deletions(-) diff --git a/cmds/balance.c b/cmds/balance.c -index 33cbb91c..43ce19e8 100644 +index 7abc69d9..ab86ff36 100644 --- a/cmds/balance.c +++ b/cmds/balance.c -@@ -503,8 +503,7 @@ static const char * const cmd_balance_start_usage[] = { +@@ -376,8 +376,7 @@ static const char * const cmd_balance_start_usage[] = { "-d[filters] act on data chunks", "-m[filters] act on metadata chunks", "-s[filters] act on system chunks (only under -f)", @@ -26,7 +26,7 @@ index 33cbb91c..43ce19e8 100644 "--full-balance do not print warning and do not delay start", "--background|--bg", " run the balance as a background process", -@@ -527,7 +526,6 @@ static int cmd_balance_start(const struct cmd_struct *cmd, +@@ -400,7 +399,6 @@ static int cmd_balance_start(const struct cmd_struct *cmd, int background = 0; bool enqueue = false; unsigned start_flags = 0; @@ -34,7 +34,7 @@ index 33cbb91c..43ce19e8 100644 int i; memset(&args, 0, sizeof(args)); -@@ -634,8 +632,6 @@ static int cmd_balance_start(const struct cmd_struct *cmd, +@@ -507,8 +505,6 @@ static int cmd_balance_start(const struct cmd_struct *cmd, /* soft makes sense only when convert for corresponding type is set */ for (i = 0; ptrs[i]; i++) { @@ -43,12 +43,11 @@ index 33cbb91c..43ce19e8 100644 if ((ptrs[i]->flags & BTRFS_BALANCE_ARGS_SOFT) && !(ptrs[i]->flags & BTRFS_BALANCE_ARGS_CONVERT)) { error("'soft' option can be used only when converting profiles"); -@@ -645,34 +641,11 @@ static int cmd_balance_start(const struct cmd_struct *cmd, +@@ -518,33 +514,10 @@ static int cmd_balance_start(const struct cmd_struct *cmd, if (!(ptrs[i]->flags & BTRFS_BALANCE_ARGS_CONVERT)) continue; -- if (!(ptrs[i]->target & (BTRFS_BLOCK_GROUP_RAID6 | -- BTRFS_BLOCK_GROUP_RAID5))) +- if (!(ptrs[i]->target & BTRFS_BLOCK_GROUP_RAID56_MASK)) - continue; - - if (raid56_warned) @@ -73,8 +72,7 @@ index 33cbb91c..43ce19e8 100644 - printf("%2d", delay--); - fflush(stdout); - sleep(1); -+ if (ptrs[i]->target & (BTRFS_BLOCK_GROUP_RAID6 | -+ BTRFS_BLOCK_GROUP_RAID5)) { ++ if (ptrs[i]->target & BTRFS_BLOCK_GROUP_RAID56_MASK) { + error("RAID5/6 support has known problems and is disabled."); + return 1; } @@ -83,12 +81,12 @@ index 33cbb91c..43ce19e8 100644 if (!(start_flags & BALANCE_START_FILTERS) && !(start_flags & BALANCE_START_NOWARN)) { diff --git a/mkfs/main.c b/mkfs/main.c -index eab93eb3..72cb8dc6 100644 +index 4d50bd25..5f66e6ae 100644 --- a/mkfs/main.c +++ b/mkfs/main.c -@@ -1190,8 +1190,8 @@ int BOX_MAIN(mkfs)(int argc, char **argv) - if ((data_profile | metadata_profile) & - (BTRFS_BLOCK_GROUP_RAID5 | BTRFS_BLOCK_GROUP_RAID6)) { +@@ -1176,8 +1176,8 @@ int BOX_MAIN(mkfs)(int argc, char **argv) + + if ((data_profile | metadata_profile) & BTRFS_BLOCK_GROUP_RAID56_MASK) { features |= BTRFS_FEATURE_INCOMPAT_RAID56; - warning("RAID5/6 support has known problems is strongly discouraged\n" - "\t to be used besides testing or evaluation.\n"); diff --git a/SOURCES/1101-Require-clowntown-for-quota-enable.patch b/SOURCES/1101-Require-clowntown-for-quota-enable.patch index 09ab8fa..6a0a329 100644 --- a/SOURCES/1101-Require-clowntown-for-quota-enable.patch +++ b/SOURCES/1101-Require-clowntown-for-quota-enable.patch @@ -1,5 +1,4 @@ -From 72dcd3588774126e8769034847dd676a28a33dce Mon Sep 17 00:00:00 2001 -Message-Id: <72dcd3588774126e8769034847dd676a28a33dce.1628630682.git.osandov@fb.com> +From 3affbd9749792375b50ad50a335e053917ab1d04 Mon Sep 17 00:00:00 2001 From: Omar Sandoval Date: Tue, 10 Aug 2021 23:24:38 +0200 Subject: [PATCH] Require --clowntown for quota enable diff --git a/SPECS/btrfs-progs.spec b/SPECS/btrfs-progs.spec index 8a66076..ddd8f79 100644 --- a/SPECS/btrfs-progs.spec +++ b/SPECS/btrfs-progs.spec @@ -1,6 +1,6 @@ Name: btrfs-progs -Version: 5.13.1 -Release: 2%{?dist} +Version: 5.14.2 +Release: 1.1%{?dist} Summary: Userspace programs for btrfs License: GPLv2 @@ -26,6 +26,7 @@ BuildRequires: libacl-devel, lzo-devel BuildRequires: pkgconfig(blkid) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libzstd) >= 1.0.0 BuildRequires: asciidoc, xmlto BuildRequires: systemd @@ -39,6 +40,8 @@ check, modify and correct any inconsistencies in the btrfs filesystem. %package -n libbtrfs Summary: btrfs filesystem-specific runtime libraries License: GPLv2 +# Upstream deprecated this library +Provides: deprecated() # This was not properly split out before Conflicts: %{name} < 4.20.2 @@ -148,6 +151,22 @@ popd %{python3_sitearch}/btrfsutil-*.egg-info/ %changelog +* Sat Jan 15 2022 Neal Gompa - 5.14.2-1.1 +- Adapt for CentOS Hyperscale +- Refresh patch for disabling raid56 mode + +* Sat Oct 09 2021 Neal Gompa - 5.14.2-1 +- Update to 5.14.2 + +* Mon Sep 20 2021 Neal Gompa - 5.14.1-1 +- Update to 5.14.1 + +* Fri Sep 10 2021 Neal Gompa - 5.14-2 +- Mark libbtrfs as deprecated, per upstream release notes + +* Fri Sep 10 2021 Neal Gompa - 5.14-1 +- Update to 5.14 + * Wed Sep 01 2021 Neal Gompa - 5.13.1-2 - Refresh patch for disabling raid56 mode with fixes from Omar Sandoval