From 8af088a7409317bba8074ce3afa89a16ef2e46b9 Mon Sep 17 00:00:00 2001 From: wguanghao Date: Mon, 19 Jun 2023 11:21:38 +0800 Subject: [PATCH] mkfs.xfs: disable inobtcount feature (cherry picked from commit b83b1da3d420977059352d80f3a471e5377c8e75) --- ...-mkfs.xfs-disable-inobtcount-feature.patch | 31 +++++++++++++++++++ xfsprogs.spec | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0006-mkfs.xfs-disable-inobtcount-feature.patch diff --git a/0006-mkfs.xfs-disable-inobtcount-feature.patch b/0006-mkfs.xfs-disable-inobtcount-feature.patch new file mode 100644 index 0000000..0810b99 --- /dev/null +++ b/0006-mkfs.xfs-disable-inobtcount-feature.patch @@ -0,0 +1,31 @@ +From 25d94d8a188ce3cade4d9ee8ab3b032ca0dccdc4 Mon Sep 17 00:00:00 2001 +From: wguanghao +Date: Mon, 19 Jun 2023 11:12:43 +0800 +Subject: [PATCH] mkfs.xfs: disable inobtcount feature + +In the 5.10 kernel, XFS inobtcount is consisdered a risky +feature and isn't yet stable. + +So it's disabled by default. + +Signed-off-by: Wu Guanghao +--- + mkfs/xfs_mkfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c +index 13359d9..b7e335f 100644 +--- a/mkfs/xfs_mkfs.c ++++ b/mkfs/xfs_mkfs.c +@@ -3886,7 +3886,7 @@ main( + .spinodes = true, + .rmapbt = false, + .reflink = true, +- .inobtcnt = true, ++ .inobtcnt = false, + .parent_pointers = false, + .nodalign = false, + .nortalign = false, +-- +2.33.0 + diff --git a/xfsprogs.spec b/xfsprogs.spec index d5995b5..0a47b1c 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,6 +1,6 @@ Name: xfsprogs Version: 5.14.1 -Release: 8 +Release: 9 Summary: Administration and debugging tools for the XFS file system License: GPL+ and LGPLv2+ URL: https://xfs.wiki.kernel.org @@ -24,6 +24,7 @@ Patch2: 0002-libxfs-fix-inode-reservation-space-for-removing-tran.patch Patch3: 0003-mkfs-prevent-corruption-of-passed-in-suboption-strin.patch Patch4: 0004-xfsprogs-Add-sw64-architecture.patch Patch5: 0005-xfs_db-use-preferable-macro-to-seek-offset-for-local.patch +Patch6: 0006-mkfs.xfs-disable-inobtcount-feature.patch %description xfsprogs are the userspace utilities that manage XFS filesystems. @@ -107,6 +108,9 @@ rm -rf %{buildroot}%{_datadir}/doc/xfsprogs/ %changelog +* Mon Jun 19 2023 wuguanghao - 5.14.1-9 +- mkfs.xfs:disable inobtcount feature + * Fri Apr 28 2023 Zhiqiang Liu - 5.14.1-8 - readline has been removed by bbe12eb9a0f9 (xfsprogs: remove libreadline support), we can use --enable-editline=yes to enable similar functions. -- Gitee