From 0cb664ebd055257d7415e165f73fb010dd72d832 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 27 May 2024 20:32:15 +0200 Subject: [PATCH] drop nilfs2 patch --- ...rblock-data-array-index-computation-.patch | 73 ------------------- queue-6.1/series | 1 - ...rblock-data-array-index-computation-.patch | 73 ------------------- queue-6.6/series | 1 - ...rblock-data-array-index-computation-.patch | 73 ------------------- queue-6.8/series | 1 - ...rblock-data-array-index-computation-.patch | 73 ------------------- queue-6.9/series | 1 - 8 files changed, 296 deletions(-) delete mode 100644 queue-6.1/nilfs2-make-superblock-data-array-index-computation-.patch delete mode 100644 queue-6.6/nilfs2-make-superblock-data-array-index-computation-.patch delete mode 100644 queue-6.8/nilfs2-make-superblock-data-array-index-computation-.patch delete mode 100644 queue-6.9/nilfs2-make-superblock-data-array-index-computation-.patch diff --git a/queue-6.1/nilfs2-make-superblock-data-array-index-computation-.patch b/queue-6.1/nilfs2-make-superblock-data-array-index-computation-.patch deleted file mode 100644 index efedbfb56d3..00000000000 --- a/queue-6.1/nilfs2-make-superblock-data-array-index-computation-.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 3d2cdadba20db675bdbc1043ef7d4324771d8474 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 30 Apr 2024 17:00:19 +0900 -Subject: nilfs2: make superblock data array index computation sparse friendly - -From: Ryusuke Konishi - -[ Upstream commit 91d743a9c8299de1fc1b47428d8bb4c85face00f ] - -Upon running sparse, "warning: dubious: x & !y" is output at an array -index calculation within nilfs_load_super_block(). - -The calculation is not wrong, but to eliminate the sparse warning, replace -it with an equivalent calculation. - -Also, add a comment to make it easier to understand what the unintuitive -array index calculation is doing and whether it's correct. - -Link: https://lkml.kernel.org/r/20240430080019.4242-3-konishi.ryusuke@gmail.com -Fixes: e339ad31f599 ("nilfs2: introduce secondary super block") -Signed-off-by: Ryusuke Konishi -Cc: Bart Van Assche -Cc: Jens Axboe -Cc: kernel test robot -Signed-off-by: Andrew Morton -Signed-off-by: Sasha Levin ---- - fs/nilfs2/the_nilfs.c | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c -index 71400496ed365..3e3c1d32da180 100644 ---- a/fs/nilfs2/the_nilfs.c -+++ b/fs/nilfs2/the_nilfs.c -@@ -592,7 +592,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs, - struct nilfs_super_block **sbp = nilfs->ns_sbp; - struct buffer_head **sbh = nilfs->ns_sbh; - u64 sb2off, devsize = bdev_nr_bytes(nilfs->ns_bdev); -- int valid[2], swp = 0; -+ int valid[2], swp = 0, older; - - if (devsize < NILFS_SEG_MIN_BLOCKS * NILFS_MIN_BLOCK_SIZE + 4096) { - nilfs_err(sb, "device size too small"); -@@ -648,9 +648,25 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs, - if (swp) - nilfs_swap_super_block(nilfs); - -+ /* -+ * Calculate the array index of the older superblock data. -+ * If one has been dropped, set index 0 pointing to the remaining one, -+ * otherwise set index 1 pointing to the old one (including if both -+ * are the same). -+ * -+ * Divided case valid[0] valid[1] swp -> older -+ * ------------------------------------------------------------- -+ * Both SBs are invalid 0 0 N/A (Error) -+ * SB1 is invalid 0 1 1 0 -+ * SB2 is invalid 1 0 0 0 -+ * SB2 is newer 1 1 1 0 -+ * SB2 is older or the same 1 1 0 1 -+ */ -+ older = valid[1] ^ swp; -+ - nilfs->ns_sbwcount = 0; - nilfs->ns_sbwtime = le64_to_cpu(sbp[0]->s_wtime); -- nilfs->ns_prot_seq = le64_to_cpu(sbp[valid[1] & !swp]->s_last_seq); -+ nilfs->ns_prot_seq = le64_to_cpu(sbp[older]->s_last_seq); - *sbpp = sbp[0]; - return 0; - } --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 81d1e33f9a5..d376afa3d93 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -260,7 +260,6 @@ ext4-fix-unit-mismatch-in-ext4_mb_new_blocks_simple.patch ext4-try-all-groups-in-ext4_mb_new_blocks_simple.patch ext4-remove-unused-parameter-from-ext4_mb_new_blocks.patch ext4-fix-potential-unnitialized-variable.patch -nilfs2-make-superblock-data-array-index-computation-.patch sunrpc-fix-gss_free_in_token_pages.patch selftests-kcmp-remove-unused-open-mode.patch rdma-ipoib-fix-format-truncation-compilation-errors.patch diff --git a/queue-6.6/nilfs2-make-superblock-data-array-index-computation-.patch b/queue-6.6/nilfs2-make-superblock-data-array-index-computation-.patch deleted file mode 100644 index 4b53a01c56f..00000000000 --- a/queue-6.6/nilfs2-make-superblock-data-array-index-computation-.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 967063a06ff3dbf6a830b20ac88a12b782ef4548 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 30 Apr 2024 17:00:19 +0900 -Subject: nilfs2: make superblock data array index computation sparse friendly - -From: Ryusuke Konishi - -[ Upstream commit 91d743a9c8299de1fc1b47428d8bb4c85face00f ] - -Upon running sparse, "warning: dubious: x & !y" is output at an array -index calculation within nilfs_load_super_block(). - -The calculation is not wrong, but to eliminate the sparse warning, replace -it with an equivalent calculation. - -Also, add a comment to make it easier to understand what the unintuitive -array index calculation is doing and whether it's correct. - -Link: https://lkml.kernel.org/r/20240430080019.4242-3-konishi.ryusuke@gmail.com -Fixes: e339ad31f599 ("nilfs2: introduce secondary super block") -Signed-off-by: Ryusuke Konishi -Cc: Bart Van Assche -Cc: Jens Axboe -Cc: kernel test robot -Signed-off-by: Andrew Morton -Signed-off-by: Sasha Levin ---- - fs/nilfs2/the_nilfs.c | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c -index 71400496ed365..3e3c1d32da180 100644 ---- a/fs/nilfs2/the_nilfs.c -+++ b/fs/nilfs2/the_nilfs.c -@@ -592,7 +592,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs, - struct nilfs_super_block **sbp = nilfs->ns_sbp; - struct buffer_head **sbh = nilfs->ns_sbh; - u64 sb2off, devsize = bdev_nr_bytes(nilfs->ns_bdev); -- int valid[2], swp = 0; -+ int valid[2], swp = 0, older; - - if (devsize < NILFS_SEG_MIN_BLOCKS * NILFS_MIN_BLOCK_SIZE + 4096) { - nilfs_err(sb, "device size too small"); -@@ -648,9 +648,25 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs, - if (swp) - nilfs_swap_super_block(nilfs); - -+ /* -+ * Calculate the array index of the older superblock data. -+ * If one has been dropped, set index 0 pointing to the remaining one, -+ * otherwise set index 1 pointing to the old one (including if both -+ * are the same). -+ * -+ * Divided case valid[0] valid[1] swp -> older -+ * ------------------------------------------------------------- -+ * Both SBs are invalid 0 0 N/A (Error) -+ * SB1 is invalid 0 1 1 0 -+ * SB2 is invalid 1 0 0 0 -+ * SB2 is newer 1 1 1 0 -+ * SB2 is older or the same 1 1 0 1 -+ */ -+ older = valid[1] ^ swp; -+ - nilfs->ns_sbwcount = 0; - nilfs->ns_sbwtime = le64_to_cpu(sbp[0]->s_wtime); -- nilfs->ns_prot_seq = le64_to_cpu(sbp[valid[1] & !swp]->s_last_seq); -+ nilfs->ns_prot_seq = le64_to_cpu(sbp[older]->s_last_seq); - *sbpp = sbp[0]; - return 0; - } --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 9f483ed601d..095f191d239 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -365,7 +365,6 @@ drivers-virt-acrn-fix-pfnmap-pte-checks-in-acrn_vm_r.patch sunrpc-removed-redundant-procp-check.patch ext4-fix-potential-unnitialized-variable.patch ext4-remove-the-redundant-folio_wait_stable.patch -nilfs2-make-superblock-data-array-index-computation-.patch of-module-add-buffer-overflow-check-in-of_modalias.patch rdma-bnxt_re-refactor-the-queue-index-update.patch rdma-bnxt_re-remove-roundup_pow_of_two-depth-for-all.patch diff --git a/queue-6.8/nilfs2-make-superblock-data-array-index-computation-.patch b/queue-6.8/nilfs2-make-superblock-data-array-index-computation-.patch deleted file mode 100644 index 20cee82b9e1..00000000000 --- a/queue-6.8/nilfs2-make-superblock-data-array-index-computation-.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 1a2b8f7bac3225b1cebdde61de11e1026227d182 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 30 Apr 2024 17:00:19 +0900 -Subject: nilfs2: make superblock data array index computation sparse friendly - -From: Ryusuke Konishi - -[ Upstream commit 91d743a9c8299de1fc1b47428d8bb4c85face00f ] - -Upon running sparse, "warning: dubious: x & !y" is output at an array -index calculation within nilfs_load_super_block(). - -The calculation is not wrong, but to eliminate the sparse warning, replace -it with an equivalent calculation. - -Also, add a comment to make it easier to understand what the unintuitive -array index calculation is doing and whether it's correct. - -Link: https://lkml.kernel.org/r/20240430080019.4242-3-konishi.ryusuke@gmail.com -Fixes: e339ad31f599 ("nilfs2: introduce secondary super block") -Signed-off-by: Ryusuke Konishi -Cc: Bart Van Assche -Cc: Jens Axboe -Cc: kernel test robot -Signed-off-by: Andrew Morton -Signed-off-by: Sasha Levin ---- - fs/nilfs2/the_nilfs.c | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c -index 71400496ed365..3e3c1d32da180 100644 ---- a/fs/nilfs2/the_nilfs.c -+++ b/fs/nilfs2/the_nilfs.c -@@ -592,7 +592,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs, - struct nilfs_super_block **sbp = nilfs->ns_sbp; - struct buffer_head **sbh = nilfs->ns_sbh; - u64 sb2off, devsize = bdev_nr_bytes(nilfs->ns_bdev); -- int valid[2], swp = 0; -+ int valid[2], swp = 0, older; - - if (devsize < NILFS_SEG_MIN_BLOCKS * NILFS_MIN_BLOCK_SIZE + 4096) { - nilfs_err(sb, "device size too small"); -@@ -648,9 +648,25 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs, - if (swp) - nilfs_swap_super_block(nilfs); - -+ /* -+ * Calculate the array index of the older superblock data. -+ * If one has been dropped, set index 0 pointing to the remaining one, -+ * otherwise set index 1 pointing to the old one (including if both -+ * are the same). -+ * -+ * Divided case valid[0] valid[1] swp -> older -+ * ------------------------------------------------------------- -+ * Both SBs are invalid 0 0 N/A (Error) -+ * SB1 is invalid 0 1 1 0 -+ * SB2 is invalid 1 0 0 0 -+ * SB2 is newer 1 1 1 0 -+ * SB2 is older or the same 1 1 0 1 -+ */ -+ older = valid[1] ^ swp; -+ - nilfs->ns_sbwcount = 0; - nilfs->ns_sbwtime = le64_to_cpu(sbp[0]->s_wtime); -- nilfs->ns_prot_seq = le64_to_cpu(sbp[valid[1] & !swp]->s_last_seq); -+ nilfs->ns_prot_seq = le64_to_cpu(sbp[older]->s_last_seq); - *sbpp = sbp[0]; - return 0; - } --- -2.43.0 - diff --git a/queue-6.8/series b/queue-6.8/series index 4b84ad9a6d9..4836484933d 100644 --- a/queue-6.8/series +++ b/queue-6.8/series @@ -461,7 +461,6 @@ ext4-remove-the-redundant-folio_wait_stable.patch clk-qcom-fix-sc_camcc_8280xp-dependencies.patch clk-qcom-fix-sm_gpucc_8650-dependencies.patch clk-qcom-apss-ipq-pll-fix-pll-rate-for-ipq5018.patch -nilfs2-make-superblock-data-array-index-computation-.patch of-module-add-buffer-overflow-check-in-of_modalias.patch bnxt_re-avoid-shift-undefined-behavior-in-bnxt_qplib.patch sunrpc-fix-gss_free_in_token_pages.patch diff --git a/queue-6.9/nilfs2-make-superblock-data-array-index-computation-.patch b/queue-6.9/nilfs2-make-superblock-data-array-index-computation-.patch deleted file mode 100644 index 6db48ae60eb..00000000000 --- a/queue-6.9/nilfs2-make-superblock-data-array-index-computation-.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 5017482ff3b29550015cce7f81279dc69aefd6fe Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 30 Apr 2024 17:00:19 +0900 -Subject: nilfs2: make superblock data array index computation sparse friendly - -From: Ryusuke Konishi - -[ Upstream commit 91d743a9c8299de1fc1b47428d8bb4c85face00f ] - -Upon running sparse, "warning: dubious: x & !y" is output at an array -index calculation within nilfs_load_super_block(). - -The calculation is not wrong, but to eliminate the sparse warning, replace -it with an equivalent calculation. - -Also, add a comment to make it easier to understand what the unintuitive -array index calculation is doing and whether it's correct. - -Link: https://lkml.kernel.org/r/20240430080019.4242-3-konishi.ryusuke@gmail.com -Fixes: e339ad31f599 ("nilfs2: introduce secondary super block") -Signed-off-by: Ryusuke Konishi -Cc: Bart Van Assche -Cc: Jens Axboe -Cc: kernel test robot -Signed-off-by: Andrew Morton -Signed-off-by: Sasha Levin ---- - fs/nilfs2/the_nilfs.c | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - -diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c -index 2ae2c1bbf6d17..adbc6e87471ab 100644 ---- a/fs/nilfs2/the_nilfs.c -+++ b/fs/nilfs2/the_nilfs.c -@@ -592,7 +592,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs, - struct nilfs_super_block **sbp = nilfs->ns_sbp; - struct buffer_head **sbh = nilfs->ns_sbh; - u64 sb2off, devsize = bdev_nr_bytes(nilfs->ns_bdev); -- int valid[2], swp = 0; -+ int valid[2], swp = 0, older; - - if (devsize < NILFS_SEG_MIN_BLOCKS * NILFS_MIN_BLOCK_SIZE + 4096) { - nilfs_err(sb, "device size too small"); -@@ -648,9 +648,25 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs, - if (swp) - nilfs_swap_super_block(nilfs); - -+ /* -+ * Calculate the array index of the older superblock data. -+ * If one has been dropped, set index 0 pointing to the remaining one, -+ * otherwise set index 1 pointing to the old one (including if both -+ * are the same). -+ * -+ * Divided case valid[0] valid[1] swp -> older -+ * ------------------------------------------------------------- -+ * Both SBs are invalid 0 0 N/A (Error) -+ * SB1 is invalid 0 1 1 0 -+ * SB2 is invalid 1 0 0 0 -+ * SB2 is newer 1 1 1 0 -+ * SB2 is older or the same 1 1 0 1 -+ */ -+ older = valid[1] ^ swp; -+ - nilfs->ns_sbwcount = 0; - nilfs->ns_sbwtime = le64_to_cpu(sbp[0]->s_wtime); -- nilfs->ns_prot_seq = le64_to_cpu(sbp[valid[1] & !swp]->s_last_seq); -+ nilfs->ns_prot_seq = le64_to_cpu(sbp[older]->s_last_seq); - *sbpp = sbp[0]; - return 0; - } --- -2.43.0 - diff --git a/queue-6.9/series b/queue-6.9/series index ac71037d3d7..8f444a022a0 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -398,7 +398,6 @@ ext4-remove-the-redundant-folio_wait_stable.patch clk-qcom-fix-sc_camcc_8280xp-dependencies.patch clk-qcom-fix-sm_gpucc_8650-dependencies.patch clk-qcom-apss-ipq-pll-fix-pll-rate-for-ipq5018.patch -nilfs2-make-superblock-data-array-index-computation-.patch of-module-add-buffer-overflow-check-in-of_modalias.patch bnxt_re-avoid-shift-undefined-behavior-in-bnxt_qplib.patch sunrpc-fix-gss_free_in_token_pages.patch -- 2.47.3