diff for duplicates of <20241118102050.16077-2-kovalev@altlinux.org> diff --git a/a/1.txt b/N1/1.txt index 5ccbb56..e313eed 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,85 +1,73 @@ -From: Jason Yan <yanaijie@huawei.com> +[ Sasha's backport helper bot ] -[ Upstream commit db9345d9e6f075e1ec26afadf744078ead935fec ] +Hi, -Factor out ext4_hash_info_init() to simplify __ext4_fill_super(). No -functional change. +The upstream commit SHA1 provided is correct: db9345d9e6f075e1ec26afadf744078ead935fec -Signed-off-by: Jason Yan <yanaijie@huawei.com> -Link: https://lore.kernel.org/r/20230323140517.1070239-2-yanaijie@huawei.com -Signed-off-by: Theodore Ts'o <tytso@mit.edu> -Signed-off-by: Vasiliy Kovalev <kovalev@altlinux.org> ---- - fs/ext4/super.c | 50 +++++++++++++++++++++++++++++-------------------- - 1 file changed, 30 insertions(+), 20 deletions(-) +WARNING: Author mismatch between patch and upstream commit: +Backport author: Vasiliy Kovalev <kovalev@altlinux.org> +Commit author: Jason Yan <yanaijie@huawei.com> -diff --git a/fs/ext4/super.c b/fs/ext4/super.c -index 3bf214d4afef5..cf2c8cf507780 100644 ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -5042,6 +5042,35 @@ static int ext4_load_super(struct super_block *sb, ext4_fsblk_t *lsb, - return ret; - } - -+static void ext4_hash_info_init(struct super_block *sb) -+{ -+ struct ext4_sb_info *sbi = EXT4_SB(sb); -+ struct ext4_super_block *es = sbi->s_es; -+ unsigned int i; -+ -+ for (i = 0; i < 4; i++) -+ sbi->s_hash_seed[i] = le32_to_cpu(es->s_hash_seed[i]); -+ -+ sbi->s_def_hash_version = es->s_def_hash_version; -+ if (ext4_has_feature_dir_index(sb)) { -+ i = le32_to_cpu(es->s_flags); -+ if (i & EXT2_FLAGS_UNSIGNED_HASH) -+ sbi->s_hash_unsigned = 3; -+ else if ((i & EXT2_FLAGS_SIGNED_HASH) == 0) { -+#ifdef __CHAR_UNSIGNED__ -+ if (!sb_rdonly(sb)) -+ es->s_flags |= -+ cpu_to_le32(EXT2_FLAGS_UNSIGNED_HASH); -+ sbi->s_hash_unsigned = 3; -+#else -+ if (!sb_rdonly(sb)) -+ es->s_flags |= -+ cpu_to_le32(EXT2_FLAGS_SIGNED_HASH); -+#endif -+ } -+ } -+} +Commit in newer trees: + +|-----------------|----------------------------------------------| +| 6.11.y | Present (exact SHA1) | +|-----------------|----------------------------------------------| + +Note: The patch differs from the upstream commit: +--- +--- - 2024-11-18 17:26:48.895059440 -0500 ++++ /tmp/tmp.VjhMY5d2bY 2024-11-18 17:26:48.887055706 -0500 +@@ -1,18 +1,21 @@ ++[ Upstream commit db9345d9e6f075e1ec26afadf744078ead935fec ] + - static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) - { - struct ext4_super_block *es = NULL; -@@ -5197,26 +5226,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) - sbi->s_addr_per_block_bits = ilog2(EXT4_ADDR_PER_BLOCK(sb)); - sbi->s_desc_per_block_bits = ilog2(EXT4_DESC_PER_BLOCK(sb)); + Factor out ext4_hash_info_init() to simplify __ext4_fill_super(). No + functional change. -- for (i = 0; i < 4; i++) -- sbi->s_hash_seed[i] = le32_to_cpu(es->s_hash_seed[i]); -- sbi->s_def_hash_version = es->s_def_hash_version; -- if (ext4_has_feature_dir_index(sb)) { -- i = le32_to_cpu(es->s_flags); -- if (i & EXT2_FLAGS_UNSIGNED_HASH) -- sbi->s_hash_unsigned = 3; -- else if ((i & EXT2_FLAGS_SIGNED_HASH) == 0) { --#ifdef __CHAR_UNSIGNED__ -- if (!sb_rdonly(sb)) -- es->s_flags |= -- cpu_to_le32(EXT2_FLAGS_UNSIGNED_HASH); -- sbi->s_hash_unsigned = 3; --#else -- if (!sb_rdonly(sb)) -- es->s_flags |= -- cpu_to_le32(EXT2_FLAGS_SIGNED_HASH); --#endif -- } -- } -+ ext4_hash_info_init(sb); + Signed-off-by: Jason Yan <yanaijie@huawei.com> + Link: https://lore.kernel.org/r/20230323140517.1070239-2-yanaijie@huawei.com + Signed-off-by: Theodore Ts'o <tytso@mit.edu> ++Signed-off-by: Vasiliy Kovalev <kovalev@altlinux.org> + --- + fs/ext4/super.c | 50 +++++++++++++++++++++++++++++-------------------- + 1 file changed, 30 insertions(+), 20 deletions(-) - if (ext4_handle_clustersize(sb)) - goto failed_mount; --- -2.33.8 + diff --git a/fs/ext4/super.c b/fs/ext4/super.c +-index 690faf766d23a..13c0345c53873 100644 ++index 3bf214d4afef5..cf2c8cf507780 100644 + --- a/fs/ext4/super.c + +++ b/fs/ext4/super.c +-@@ -5024,6 +5024,35 @@ static int ext4_load_super(struct super_block *sb, ext4_fsblk_t *lsb, ++@@ -5042,6 +5042,35 @@ static int ext4_load_super(struct super_block *sb, ext4_fsblk_t *lsb, + return ret; + } + +@@ -48,7 +51,7 @@ + static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) + { + struct ext4_super_block *es = NULL; +-@@ -5179,26 +5208,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) ++@@ -5197,26 +5226,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) + sbi->s_addr_per_block_bits = ilog2(EXT4_ADDR_PER_BLOCK(sb)); + sbi->s_desc_per_block_bits = ilog2(EXT4_DESC_PER_BLOCK(sb)); + +@@ -76,3 +79,6 @@ + + if (ext4_handle_clustersize(sb)) + goto failed_mount; ++-- ++2.33.8 ++ +--- + +Results of testing on various branches: + +| Branch | Patch Apply | Build Test | +|---------------------------|-------------|------------| +| stable/linux-6.11.y | Failed | N/A | +| stable/linux-6.6.y | Failed | N/A | +| stable/linux-6.1.y | Success | Success | +| stable/linux-5.15.y | Failed | N/A | +| stable/linux-5.10.y | Failed | N/A | +| stable/linux-5.4.y | Failed | N/A | +| stable/linux-4.19.y | Failed | N/A | diff --git a/a/content_digest b/N1/content_digest index 57679f6..624d4ab 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,100 +1,83 @@ - "ref\020241118102050.16077-1-kovalev@altlinux.org\0" - "From\0Vasiliy Kovalev <kovalev@altlinux.org>\0" - "Subject\0[PATCH 1/3] ext4: factor out ext4_hash_info_init()\0" - "Date\0Mon, 18 Nov 2024 13:20:48 +0300\0" - "To\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" - Sasha Levin <sashal@kernel.org> - " stable@vger.kernel.org\0" - "Cc\0lvc-project@linuxtesting.org" - dutyrok@altlinux.org - gerben@altlinux.org - " kovalev@altlinux.org\0" + "From\0Sasha Levin <sashal@kernel.org>\0" + "Subject\0Re: [PATCH 1/3] ext4: factor out ext4_hash_info_init()\0" + "Date\0Mon, 18 Nov 2024 23:36:31 -0500\0" + "To\0stable@vger.kernel.org\0" + "Cc\0Vasiliy Kovalev <kovalev@altlinux.org>" + " Sasha Levin <sashal@kernel.org>\0" "\00:1\0" "b\0" - "From: Jason Yan <yanaijie@huawei.com>\n" + "[ Sasha's backport helper bot ]\n" "\n" - "[ Upstream commit db9345d9e6f075e1ec26afadf744078ead935fec ]\n" + "Hi,\n" "\n" - "Factor out ext4_hash_info_init() to simplify __ext4_fill_super(). No\n" - "functional change.\n" + "The upstream commit SHA1 provided is correct: db9345d9e6f075e1ec26afadf744078ead935fec\n" "\n" - "Signed-off-by: Jason Yan <yanaijie@huawei.com>\n" - "Link: https://lore.kernel.org/r/20230323140517.1070239-2-yanaijie@huawei.com\n" - "Signed-off-by: Theodore Ts'o <tytso@mit.edu>\n" - "Signed-off-by: Vasiliy Kovalev <kovalev@altlinux.org>\n" - "---\n" - " fs/ext4/super.c | 50 +++++++++++++++++++++++++++++--------------------\n" - " 1 file changed, 30 insertions(+), 20 deletions(-)\n" + "WARNING: Author mismatch between patch and upstream commit:\n" + "Backport author: Vasiliy Kovalev <kovalev@altlinux.org>\n" + "Commit author: Jason Yan <yanaijie@huawei.com>\n" "\n" - "diff --git a/fs/ext4/super.c b/fs/ext4/super.c\n" - "index 3bf214d4afef5..cf2c8cf507780 100644\n" - "--- a/fs/ext4/super.c\n" - "+++ b/fs/ext4/super.c\n" - "@@ -5042,6 +5042,35 @@ static int ext4_load_super(struct super_block *sb, ext4_fsblk_t *lsb,\n" - " \treturn ret;\n" - " }\n" - " \n" - "+static void ext4_hash_info_init(struct super_block *sb)\n" - "+{\n" - "+\tstruct ext4_sb_info *sbi = EXT4_SB(sb);\n" - "+\tstruct ext4_super_block *es = sbi->s_es;\n" - "+\tunsigned int i;\n" - "+\n" - "+\tfor (i = 0; i < 4; i++)\n" - "+\t\tsbi->s_hash_seed[i] = le32_to_cpu(es->s_hash_seed[i]);\n" - "+\n" - "+\tsbi->s_def_hash_version = es->s_def_hash_version;\n" - "+\tif (ext4_has_feature_dir_index(sb)) {\n" - "+\t\ti = le32_to_cpu(es->s_flags);\n" - "+\t\tif (i & EXT2_FLAGS_UNSIGNED_HASH)\n" - "+\t\t\tsbi->s_hash_unsigned = 3;\n" - "+\t\telse if ((i & EXT2_FLAGS_SIGNED_HASH) == 0) {\n" - "+#ifdef __CHAR_UNSIGNED__\n" - "+\t\t\tif (!sb_rdonly(sb))\n" - "+\t\t\t\tes->s_flags |=\n" - "+\t\t\t\t\tcpu_to_le32(EXT2_FLAGS_UNSIGNED_HASH);\n" - "+\t\t\tsbi->s_hash_unsigned = 3;\n" - "+#else\n" - "+\t\t\tif (!sb_rdonly(sb))\n" - "+\t\t\t\tes->s_flags |=\n" - "+\t\t\t\t\tcpu_to_le32(EXT2_FLAGS_SIGNED_HASH);\n" - "+#endif\n" - "+\t\t}\n" - "+\t}\n" - "+}\n" + "Commit in newer trees:\n" + "\n" + "|-----------------|----------------------------------------------|\n" + "| 6.11.y | Present (exact SHA1) |\n" + "|-----------------|----------------------------------------------|\n" + "\n" + "Note: The patch differs from the upstream commit:\n" + "---\n" + "--- -\t2024-11-18 17:26:48.895059440 -0500\n" + "+++ /tmp/tmp.VjhMY5d2bY\t2024-11-18 17:26:48.887055706 -0500\n" + "@@ -1,18 +1,21 @@\n" + "+[ Upstream commit db9345d9e6f075e1ec26afadf744078ead935fec ]\n" "+\n" - " static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)\n" - " {\n" - " \tstruct ext4_super_block *es = NULL;\n" - "@@ -5197,26 +5226,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)\n" - " \tsbi->s_addr_per_block_bits = ilog2(EXT4_ADDR_PER_BLOCK(sb));\n" - " \tsbi->s_desc_per_block_bits = ilog2(EXT4_DESC_PER_BLOCK(sb));\n" + " Factor out ext4_hash_info_init() to simplify __ext4_fill_super(). No\n" + " functional change.\n" " \n" - "-\tfor (i = 0; i < 4; i++)\n" - "-\t\tsbi->s_hash_seed[i] = le32_to_cpu(es->s_hash_seed[i]);\n" - "-\tsbi->s_def_hash_version = es->s_def_hash_version;\n" - "-\tif (ext4_has_feature_dir_index(sb)) {\n" - "-\t\ti = le32_to_cpu(es->s_flags);\n" - "-\t\tif (i & EXT2_FLAGS_UNSIGNED_HASH)\n" - "-\t\t\tsbi->s_hash_unsigned = 3;\n" - "-\t\telse if ((i & EXT2_FLAGS_SIGNED_HASH) == 0) {\n" - "-#ifdef __CHAR_UNSIGNED__\n" - "-\t\t\tif (!sb_rdonly(sb))\n" - "-\t\t\t\tes->s_flags |=\n" - "-\t\t\t\t\tcpu_to_le32(EXT2_FLAGS_UNSIGNED_HASH);\n" - "-\t\t\tsbi->s_hash_unsigned = 3;\n" - "-#else\n" - "-\t\t\tif (!sb_rdonly(sb))\n" - "-\t\t\t\tes->s_flags |=\n" - "-\t\t\t\t\tcpu_to_le32(EXT2_FLAGS_SIGNED_HASH);\n" - "-#endif\n" - "-\t\t}\n" - "-\t}\n" - "+\text4_hash_info_init(sb);\n" + " Signed-off-by: Jason Yan <yanaijie@huawei.com>\n" + " Link: https://lore.kernel.org/r/20230323140517.1070239-2-yanaijie@huawei.com\n" + " Signed-off-by: Theodore Ts'o <tytso@mit.edu>\n" + "+Signed-off-by: Vasiliy Kovalev <kovalev@altlinux.org>\n" + " ---\n" + " fs/ext4/super.c | 50 +++++++++++++++++++++++++++++--------------------\n" + " 1 file changed, 30 insertions(+), 20 deletions(-)\n" " \n" - " \tif (ext4_handle_clustersize(sb))\n" - " \t\tgoto failed_mount;\n" - "-- \n" - 2.33.8 + " diff --git a/fs/ext4/super.c b/fs/ext4/super.c\n" + "-index 690faf766d23a..13c0345c53873 100644\n" + "+index 3bf214d4afef5..cf2c8cf507780 100644\n" + " --- a/fs/ext4/super.c\n" + " +++ b/fs/ext4/super.c\n" + "-@@ -5024,6 +5024,35 @@ static int ext4_load_super(struct super_block *sb, ext4_fsblk_t *lsb,\n" + "+@@ -5042,6 +5042,35 @@ static int ext4_load_super(struct super_block *sb, ext4_fsblk_t *lsb,\n" + " \treturn ret;\n" + " }\n" + " \n" + "@@ -48,7 +51,7 @@\n" + " static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)\n" + " {\n" + " \tstruct ext4_super_block *es = NULL;\n" + "-@@ -5179,26 +5208,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)\n" + "+@@ -5197,26 +5226,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb)\n" + " \tsbi->s_addr_per_block_bits = ilog2(EXT4_ADDR_PER_BLOCK(sb));\n" + " \tsbi->s_desc_per_block_bits = ilog2(EXT4_DESC_PER_BLOCK(sb));\n" + " \n" + "@@ -76,3 +79,6 @@\n" + " \n" + " \tif (ext4_handle_clustersize(sb))\n" + " \t\tgoto failed_mount;\n" + "+-- \n" + "+2.33.8\n" + "+\n" + "---\n" + "\n" + "Results of testing on various branches:\n" + "\n" + "| Branch | Patch Apply | Build Test |\n" + "|---------------------------|-------------|------------|\n" + "| stable/linux-6.11.y | Failed | N/A |\n" + "| stable/linux-6.6.y | Failed | N/A |\n" + "| stable/linux-6.1.y | Success | Success |\n" + "| stable/linux-5.15.y | Failed | N/A |\n" + "| stable/linux-5.10.y | Failed | N/A |\n" + "| stable/linux-5.4.y | Failed | N/A |\n" + | stable/linux-4.19.y | Failed | N/A | -101638ba98d8a9dd6602ff29b108e68ba6b80c1ec6ffcdd3857f50f7eeb7e7ef +3748ba77a32283fdfc8e6a5301b593569adf605ae9eeac50a165490a5f320884
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.