diff --git a/1001-Disable-metadata_csum-for-ext4-by-default-until-upst.patch b/1001-Disable-metadata_csum-for-ext4-by-default-until-upst.patch deleted file mode 100644 index a722070d2ce8ca415b738fb0e77dc2e58792d1b4..0000000000000000000000000000000000000000 --- a/1001-Disable-metadata_csum-for-ext4-by-default-until-upst.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9a176b97faadaabca497f54adc32ba6656c33605 Mon Sep 17 00:00:00 2001 -From: Joseph Qi -Date: Fri, 12 Aug 2022 11:23:37 +0800 -Subject: [PATCH 1/9] Disable metadata_csum for ext4 by default until upstream - fix perf loss - -AIM9 benchmarks show there are 17%~62% system perf regression loss if -ext4 metadata_csum enabled. Here we disable this default metadata_csum -for ext4 until upstream fix perf regression loss. - -Signed-off-by: Jacob Wang -(cherry picked from commit 7964b9c2e16fe478bc6560b783e9fa9f6fcf3661) -[ caspar: adjust patch to apply in new version ] -Signed-off-by: Caspar Zhang -Signed-off-by: weitao zhou -Signed-off-by: Joseph Qi ---- - misc/mke2fs.conf.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in -index a533b210..99a29fdb 100644 ---- a/misc/mke2fs.conf.in -+++ b/misc/mke2fs.conf.in -@@ -11,7 +11,7 @@ - features = has_journal - } - ext4 = { -- features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize -+ features = has_journal,extent,huge_file,flex_bg,uninit_bg,64bit,dir_nlink,extra_isize - inode_size = 256 - } - rhel6_ext4 = { --- -2.24.4 - diff --git a/1002-e2fsck-endianness-fixes-for-fast-commit-replay.patch b/1001-e2fsck-endianness-fixes-for-fast-commit-replay.patch similarity index 97% rename from 1002-e2fsck-endianness-fixes-for-fast-commit-replay.patch rename to 1001-e2fsck-endianness-fixes-for-fast-commit-replay.patch index 7b9a2be391725423d60b0862fa535117d867e0e0..8c96f12e46a81bf501cd3add3a3a45d10328e92a 100644 --- a/1002-e2fsck-endianness-fixes-for-fast-commit-replay.patch +++ b/1001-e2fsck-endianness-fixes-for-fast-commit-replay.patch @@ -1,7 +1,7 @@ -From ea26a4be8bee31032167b18c2b0e55a295f58952 Mon Sep 17 00:00:00 2001 +From 8a01882de42f21ee05c7f7782b7afc189bba5e8a Mon Sep 17 00:00:00 2001 From: Harshad Shirwadkar Date: Thu, 4 Feb 2021 15:36:01 -0800 -Subject: [PATCH 2/9] e2fsck: endianness fixes for fast commit replay +Subject: [PATCH 1/8] e2fsck: endianness fixes for fast commit replay There are a few places where the endianness conversion wasn't done right. This patch fixes that. Verified that after this patch, @@ -118,5 +118,5 @@ index 922c252d..2708942a 100644 if (ret) return ret; -- -2.24.4 +2.39.3 diff --git a/1003-e2fsck-add-fallthrough-comment-in-fc-replay-switch-c.patch b/1002-e2fsck-add-fallthrough-comment-in-fc-replay-switch-c.patch similarity index 87% rename from 1003-e2fsck-add-fallthrough-comment-in-fc-replay-switch-c.patch rename to 1002-e2fsck-add-fallthrough-comment-in-fc-replay-switch-c.patch index 8eb5b6acf11e9d2d4f395b3bb630ebfa2991c1d7..e3ada3f062ef9b9b30d3a47e263f9b631860dfa8 100644 --- a/1003-e2fsck-add-fallthrough-comment-in-fc-replay-switch-c.patch +++ b/1002-e2fsck-add-fallthrough-comment-in-fc-replay-switch-c.patch @@ -1,7 +1,7 @@ -From d8aa67a8799f42eee0edc4c979e8e88e27a9aedb Mon Sep 17 00:00:00 2001 +From 81704ba980d5d489572e42812d284f52e2e2c615 Mon Sep 17 00:00:00 2001 From: Harshad Shirwadkar Date: Tue, 23 Feb 2021 09:41:55 -0800 -Subject: [PATCH 3/9] e2fsck: add fallthrough comment in fc replay switch case +Subject: [PATCH 2/8] e2fsck: add fallthrough comment in fc replay switch case During fast commit replay scan phase, in ext4_fc_replay_scan(), we want to fallthrough in switch case for EXT4_FC_TAG_ADD_RANGE case. Add @@ -27,5 +27,5 @@ index 2708942a..a67ef745 100644 case EXT4_FC_TAG_LINK: case EXT4_FC_TAG_UNLINK: -- -2.24.4 +2.39.3 diff --git a/1004-e2fsck-initialize-variable-before-first-use-in-fast-.patch b/1003-e2fsck-initialize-variable-before-first-use-in-fast-.patch similarity index 92% rename from 1004-e2fsck-initialize-variable-before-first-use-in-fast-.patch rename to 1003-e2fsck-initialize-variable-before-first-use-in-fast-.patch index cf8df1003a7dbf8489e4da43b2d891a73d414a4e..69fb8ea9e341e2b81b8dc63671b10db3ce58ce8d 100644 --- a/1004-e2fsck-initialize-variable-before-first-use-in-fast-.patch +++ b/1003-e2fsck-initialize-variable-before-first-use-in-fast-.patch @@ -1,7 +1,7 @@ -From 780f047c749a582806326d75180fe68d84e220c2 Mon Sep 17 00:00:00 2001 +From dd5c5ac755ff6f868877bc18e54fe9e700845b59 Mon Sep 17 00:00:00 2001 From: Harshad Shirwadkar Date: Tue, 23 Feb 2021 09:41:56 -0800 -Subject: [PATCH 4/9] e2fsck: initialize variable before first use in fast +Subject: [PATCH 3/8] e2fsck: initialize variable before first use in fast commit replay Initialize ext2fs_ex variable in ext4_fc_replay_scan() before first @@ -44,5 +44,5 @@ index bde6b0f3..542e5034 100644 to->e_len -= EXT_INIT_MAX_LEN; to->e_flags |= EXT2_EXTENT_FLAGS_UNINIT; -- -2.24.4 +2.39.3 diff --git a/1005-e2fsck-fix-portability-problems-caused-by-unaligned-.patch b/1004-e2fsck-fix-portability-problems-caused-by-unaligned-.patch similarity index 98% rename from 1005-e2fsck-fix-portability-problems-caused-by-unaligned-.patch rename to 1004-e2fsck-fix-portability-problems-caused-by-unaligned-.patch index 3b40c47b4d185c0ef8ed59ab1d672a10e9377e9f..78aa84350d71bd48e1408874ff70e2a490b0309c 100644 --- a/1005-e2fsck-fix-portability-problems-caused-by-unaligned-.patch +++ b/1004-e2fsck-fix-portability-problems-caused-by-unaligned-.patch @@ -1,7 +1,7 @@ -From 39b05f968b38180c3a2e0159c75e1a4afed2c691 Mon Sep 17 00:00:00 2001 +From a0529ce63de59975455a5512865113ba8b9a7e48 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 3 May 2021 15:37:33 -0400 -Subject: [PATCH 5/9] e2fsck: fix portability problems caused by unaligned +Subject: [PATCH 4/8] e2fsck: fix portability problems caused by unaligned accesses The on-disk format for the ext4 journal can have unaigned 32-bit @@ -323,5 +323,5 @@ index 22ef6325..05c40cc5 100755 echo "Exit status is $?" >> $OUT -- -2.24.4 +2.39.3 diff --git a/1006-e2fsck-fix-unaligned-accesses-to-ext4_fc_tl-struct.patch b/1005-e2fsck-fix-unaligned-accesses-to-ext4_fc_tl-struct.patch similarity index 99% rename from 1006-e2fsck-fix-unaligned-accesses-to-ext4_fc_tl-struct.patch rename to 1005-e2fsck-fix-unaligned-accesses-to-ext4_fc_tl-struct.patch index a53dccf047b62108f4e1a50cc959c7a47110b171..c1414e467b5fecf0e58dc504c309a3b1936b5894 100644 --- a/1006-e2fsck-fix-unaligned-accesses-to-ext4_fc_tl-struct.patch +++ b/1005-e2fsck-fix-unaligned-accesses-to-ext4_fc_tl-struct.patch @@ -1,7 +1,7 @@ -From db72939f489a02d2148f8d1f50181a646ff810e4 Mon Sep 17 00:00:00 2001 +From b46d39509cf3618bfb38d08a85f9d6d2d99a6a8b Mon Sep 17 00:00:00 2001 From: Harshad Shirwadkar Date: Thu, 6 May 2021 17:21:10 -0700 -Subject: [PATCH 6/9] e2fsck: fix unaligned accesses to ext4_fc_tl struct +Subject: [PATCH 5/8] e2fsck: fix unaligned accesses to ext4_fc_tl struct Fast commit related struct ext4_fc_tl can be unaligned on disk. So, while accessing that we should ensure that the pointers are @@ -386,5 +386,5 @@ index b83e1810..4ad38f12 100644 - #endif /* __FAST_COMMIT_H__ */ -- -2.24.4 +2.39.3 diff --git a/1007-e2fsck-fix-unaligned-accesses-to-ext4_fc_add_range-a.patch b/1006-e2fsck-fix-unaligned-accesses-to-ext4_fc_add_range-a.patch similarity index 94% rename from 1007-e2fsck-fix-unaligned-accesses-to-ext4_fc_add_range-a.patch rename to 1006-e2fsck-fix-unaligned-accesses-to-ext4_fc_add_range-a.patch index 80f7422ac765e11803cda356d6c32d09a3834834..60aedf792423d166fa1554ae01a552b1ff2be74c 100644 --- a/1007-e2fsck-fix-unaligned-accesses-to-ext4_fc_add_range-a.patch +++ b/1006-e2fsck-fix-unaligned-accesses-to-ext4_fc_add_range-a.patch @@ -1,7 +1,7 @@ -From 9269fda7aa0af5aef422f652f3d3b9f112c8239a Mon Sep 17 00:00:00 2001 +From 3f25ba362f6a3cc2b75519e9be7eba519a84547b Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 6 May 2021 22:40:57 -0400 -Subject: [PATCH 7/9] e2fsck: fix unaligned accesses to ext4_fc_add_range and +Subject: [PATCH 6/8] e2fsck: fix unaligned accesses to ext4_fc_add_range and fc_raw_inode These fast commit related structures can be unaligned on disk. So we @@ -60,5 +60,5 @@ index ae3df800..0128fbd3 100644 memcpy(inode, fc_inode, offsetof(struct ext2_inode_large, i_block)); memcpy(&inode->i_generation, &fc_inode->i_generation, -- -2.24.4 +2.39.3 diff --git a/1008-e2fsck-sync-fc_do_one_pass-changes-from-kernel.patch b/1007-e2fsck-sync-fc_do_one_pass-changes-from-kernel.patch similarity index 90% rename from 1008-e2fsck-sync-fc_do_one_pass-changes-from-kernel.patch rename to 1007-e2fsck-sync-fc_do_one_pass-changes-from-kernel.patch index d9bf18cadfe2969365de32aed1ff95d86bd0c769..2600105428214590c6a2cbaeae23b60cb1ae4929 100644 --- a/1008-e2fsck-sync-fc_do_one_pass-changes-from-kernel.patch +++ b/1007-e2fsck-sync-fc_do_one_pass-changes-from-kernel.patch @@ -1,7 +1,7 @@ -From 58ed5445c5b44c2e629c65ffbadc948f9bfc01d8 Mon Sep 17 00:00:00 2001 +From 7a72980c0f343a72a631e161d79f7fca785dc9c2 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 15 Jun 2021 21:53:30 -0700 -Subject: [PATCH 8/9] e2fsck: sync fc_do_one_pass() changes from kernel +Subject: [PATCH 7/8] e2fsck: sync fc_do_one_pass() changes from kernel Sync the changes to fc_do_one_pass() from the kernel's recovery.c so that e2fsck picks up the fixes to the jbd_debug() statements. @@ -36,5 +36,5 @@ index 02694d2c..25744f08 100644 next_fc_block - journal->j_fc_first, expected_commit_id); -- -2.24.4 +2.39.3 diff --git a/1009-tests-add-description-for-j_recover_fast_commit.patch b/1008-tests-add-description-for-j_recover_fast_commit.patch similarity index 82% rename from 1009-tests-add-description-for-j_recover_fast_commit.patch rename to 1008-tests-add-description-for-j_recover_fast_commit.patch index cf52d637ffca057b8389c1750a0aef4463b67278..ce69f3d5f30cc07aa63a1d9421a8f1e5a42b3632 100644 --- a/1009-tests-add-description-for-j_recover_fast_commit.patch +++ b/1008-tests-add-description-for-j_recover_fast_commit.patch @@ -1,7 +1,7 @@ -From f9ce3c65b5eeaa89f190e8d02cb65b2eb28a2e41 Mon Sep 17 00:00:00 2001 +From 09c58226db0f0a651c5ad76aa9361a8ca044593e Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 29 Jul 2021 17:42:23 -0400 -Subject: [PATCH 9/9] tests: add description for j_recover_fast_commit +Subject: [PATCH 8/8] tests: add description for j_recover_fast_commit Signed-off-by: Theodore Ts'o Signed-off-by: Joseph Qi @@ -22,5 +22,5 @@ index 05c40cc5..14cbb60f 100755 gunzip < $IMAGE > $TMPFILE -- -2.24.4 +2.39.3 diff --git a/e2fsprogs.spec b/e2fsprogs.spec index a9d70ca6398dcfed7859717cef9e6a1e9607b75e..c6e44f15511400c620612cde6ef560768abed71e 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.3 Summary: Utilities for managing ext2, ext3, and ext4 file systems Name: e2fsprogs Version: 1.46.0 @@ -40,16 +40,15 @@ Patch8: 0009-tests-support-older-versions-of-timeout-in-r_corrupt.patch Patch9: 0010-tests-specify-inode-size-in-r_corrupt_fs.patch # Begin: Anolis customized patches -Patch1001: 1001-Disable-metadata_csum-for-ext4-by-default-until-upst.patch -Patch1002: 1002-e2fsck-endianness-fixes-for-fast-commit-replay.patch -Patch1003: 1003-e2fsck-add-fallthrough-comment-in-fc-replay-switch-c.patch -Patch1004: 1004-e2fsck-initialize-variable-before-first-use-in-fast-.patch -Patch1005: 1005-e2fsck-fix-portability-problems-caused-by-unaligned-.patch -Patch1006: 1006-e2fsck-fix-unaligned-accesses-to-ext4_fc_tl-struct.patch -Patch1007: 1007-e2fsck-fix-unaligned-accesses-to-ext4_fc_add_range-a.patch -Patch1008: 1008-e2fsck-sync-fc_do_one_pass-changes-from-kernel.patch -Patch1009: 1009-tests-add-description-for-j_recover_fast_commit.patch -Patch1010: e2fsprogs-1.46.0-sw.patch +Patch1001: 1001-e2fsck-endianness-fixes-for-fast-commit-replay.patch +Patch1002: 1002-e2fsck-add-fallthrough-comment-in-fc-replay-switch-c.patch +Patch1003: 1003-e2fsck-initialize-variable-before-first-use-in-fast-.patch +Patch1004: 1004-e2fsck-fix-portability-problems-caused-by-unaligned-.patch +Patch1005: 1005-e2fsck-fix-unaligned-accesses-to-ext4_fc_tl-struct.patch +Patch1006: 1006-e2fsck-fix-unaligned-accesses-to-ext4_fc_add_range-a.patch +Patch1007: 1007-e2fsck-sync-fc_do_one_pass-changes-from-kernel.patch +Patch1008: 1008-tests-add-description-for-j_recover_fast_commit.patch +Patch1009: e2fsprogs-1.46.0-sw.patch # End: Anolis customized patches %description @@ -189,7 +188,6 @@ It was originally inspired by the Multics SubSystem library. %patch1007 -p1 %patch1008 -p1 %patch1009 -p1 -%patch1010 -p1 %build %configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -352,6 +350,9 @@ exit 0 %{_libdir}/pkgconfig/ss.pc %changelog +* Wed Nov 13 2024 Joseph Qi 1.46.0-1.0.3 +- enable metadata_csum by default + * Mon May 15 2023 wxiat 1.4.0-1.0.2 - add sw patch