]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop nilfs2 patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 May 2024 18:32:15 +0000 (20:32 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 May 2024 18:32:15 +0000 (20:32 +0200)
queue-6.1/nilfs2-make-superblock-data-array-index-computation-.patch [deleted file]
queue-6.1/series
queue-6.6/nilfs2-make-superblock-data-array-index-computation-.patch [deleted file]
queue-6.6/series
queue-6.8/nilfs2-make-superblock-data-array-index-computation-.patch [deleted file]
queue-6.8/series
queue-6.9/nilfs2-make-superblock-data-array-index-computation-.patch [deleted file]
queue-6.9/series

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 (file)
index efedbfb..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From 3d2cdadba20db675bdbc1043ef7d4324771d8474 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 30 Apr 2024 17:00:19 +0900
-Subject: nilfs2: make superblock data array index computation sparse friendly
-
-From: Ryusuke Konishi <konishi.ryusuke@gmail.com>
-
-[ 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 <konishi.ryusuke@gmail.com>
-Cc: Bart Van Assche <bvanassche@acm.org>
-Cc: Jens Axboe <axboe@kernel.dk>
-Cc: kernel test robot <lkp@intel.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
index 81d1e33f9a521b668a72868e7295ed08b53459ab..d376afa3d93be172862f6de1b0afaf9a1783bea8 100644 (file)
@@ -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 (file)
index 4b53a01..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From 967063a06ff3dbf6a830b20ac88a12b782ef4548 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 30 Apr 2024 17:00:19 +0900
-Subject: nilfs2: make superblock data array index computation sparse friendly
-
-From: Ryusuke Konishi <konishi.ryusuke@gmail.com>
-
-[ 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 <konishi.ryusuke@gmail.com>
-Cc: Bart Van Assche <bvanassche@acm.org>
-Cc: Jens Axboe <axboe@kernel.dk>
-Cc: kernel test robot <lkp@intel.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
index 9f483ed601d8f1e200cb65196fa3cfd0c0de4c6d..095f191d239d9eaecef2683bb28e78d49a3d3444 100644 (file)
@@ -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 (file)
index 20cee82..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From 1a2b8f7bac3225b1cebdde61de11e1026227d182 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 30 Apr 2024 17:00:19 +0900
-Subject: nilfs2: make superblock data array index computation sparse friendly
-
-From: Ryusuke Konishi <konishi.ryusuke@gmail.com>
-
-[ 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 <konishi.ryusuke@gmail.com>
-Cc: Bart Van Assche <bvanassche@acm.org>
-Cc: Jens Axboe <axboe@kernel.dk>
-Cc: kernel test robot <lkp@intel.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
index 4b84ad9a6d9c8bc33433ab08e641ffda975db05c..4836484933d7d974b2c0cc9917edf9fe3443ec77 100644 (file)
@@ -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 (file)
index 6db48ae..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From 5017482ff3b29550015cce7f81279dc69aefd6fe Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 30 Apr 2024 17:00:19 +0900
-Subject: nilfs2: make superblock data array index computation sparse friendly
-
-From: Ryusuke Konishi <konishi.ryusuke@gmail.com>
-
-[ 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 <konishi.ryusuke@gmail.com>
-Cc: Bart Van Assche <bvanassche@acm.org>
-Cc: Jens Axboe <axboe@kernel.dk>
-Cc: kernel test robot <lkp@intel.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
index ac71037d3d7e53bb5d837be2be0c280e5994160f..8f444a022a0f74c9905c2a710c98031edcc5b9db 100644 (file)
@@ -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