Drop fs-mpage-avoid-negative-shift-for-large-blocksize.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.12/fs-mpage-avoid-negative-shift-for-large-blocksize.patch b/queue-6.12/fs-mpage-avoid-negative-shift-for-large-blocksize.patch
deleted file mode 100644 (file)
index 629f3ed..0000000
--- a/queue-6.12/fs-mpage-avoid-negative-shift-for-large-blocksize.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f2345d09fc1cbee743f0fae7e636e69045e8ec0b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 21 Feb 2025 14:38:18 -0800
-Subject: fs/mpage: avoid negative shift for large blocksize
-
-From: Hannes Reinecke <hare@kernel.org>
-
-[ Upstream commit 86c60efd7c0ede43bd677f2eee1d84200528df1e ]
-
-For large blocksizes the number of block bits is larger than PAGE_SHIFT,
-so calculate the sector number from the byte offset instead. This is
-required to enable large folios with buffer-heads.
-
-Reviewed-by: "Matthew Wilcox (Oracle)" <willy@infradead.org>
-Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
-Signed-off-by: Hannes Reinecke <hare@kernel.org>
-Link: https://lore.kernel.org/r/20250221223823.1680616-4-mcgrof@kernel.org
-Reviewed-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/mpage.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fs/mpage.c b/fs/mpage.c
-index 82aecf3727437..a3c82206977f6 100644
---- a/fs/mpage.c
-+++ b/fs/mpage.c
-@@ -181,7 +181,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)
-       if (folio_buffers(folio))
-               goto confused;
- 
--      block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits);
-+      block_in_file = folio_pos(folio) >> blkbits;
-       last_block = block_in_file + args->nr_pages * blocks_per_page;
-       last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits;
-       if (last_block > last_block_in_file)
-@@ -527,7 +527,7 @@ static int __mpage_writepage(struct folio *folio, struct writeback_control *wbc,
-        * The page has no buffers: map it to disk
-        */
-       BUG_ON(!folio_test_uptodate(folio));
--      block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits);
-+      block_in_file = folio_pos(folio) >> blkbits;
-       /*
-        * Whole page beyond EOF? Skip allocating blocks to avoid leaking
-        * space.
--- 
-2.39.5
-

diff --git a/queue-6.12/series b/queue-6.12/series
index 8924f6e239a9562bfd824e7429f690f48df9e434..c38d565477b6c5c6a296045524ee7edfca5b9092 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -307,7 +307,6 @@ scsi-mpi3mr-update-timestamp-only-for-supervisor-ioc.patch
 loop-check-in-lo_flags_direct_io-in-loop_default_blo.patch
 libbpf-fix-out-of-bound-read.patch
 dm-fix-unconditional-io-throttle-caused-by-req_prefl.patch
-fs-mpage-avoid-negative-shift-for-large-blocksize.patch
 scsi-scsi_debug-first-fixes-for-tapes.patch
 net-mlx5-change-pool_next_size-define-value-and-make.patch
 x86-kaslr-reduce-kaslr-entropy-on-most-x86-systems.patch

diff --git a/queue-6.14/fs-mpage-avoid-negative-shift-for-large-blocksize.patch b/queue-6.14/fs-mpage-avoid-negative-shift-for-large-blocksize.patch
deleted file mode 100644 (file)
index 763959b..0000000
--- a/queue-6.14/fs-mpage-avoid-negative-shift-for-large-blocksize.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 937e1cfc23766b242d46fb08e8b736ddd499d0a6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 21 Feb 2025 14:38:18 -0800
-Subject: fs/mpage: avoid negative shift for large blocksize
-
-From: Hannes Reinecke <hare@kernel.org>
-
-[ Upstream commit 86c60efd7c0ede43bd677f2eee1d84200528df1e ]
-
-For large blocksizes the number of block bits is larger than PAGE_SHIFT,
-so calculate the sector number from the byte offset instead. This is
-required to enable large folios with buffer-heads.
-
-Reviewed-by: "Matthew Wilcox (Oracle)" <willy@infradead.org>
-Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
-Signed-off-by: Hannes Reinecke <hare@kernel.org>
-Link: https://lore.kernel.org/r/20250221223823.1680616-4-mcgrof@kernel.org
-Reviewed-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/mpage.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fs/mpage.c b/fs/mpage.c
-index 82aecf3727437..a3c82206977f6 100644
---- a/fs/mpage.c
-+++ b/fs/mpage.c
-@@ -181,7 +181,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)
-       if (folio_buffers(folio))
-               goto confused;
- 
--      block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits);
-+      block_in_file = folio_pos(folio) >> blkbits;
-       last_block = block_in_file + args->nr_pages * blocks_per_page;
-       last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits;
-       if (last_block > last_block_in_file)
-@@ -527,7 +527,7 @@ static int __mpage_writepage(struct folio *folio, struct writeback_control *wbc,
-        * The page has no buffers: map it to disk
-        */
-       BUG_ON(!folio_test_uptodate(folio));
--      block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits);
-+      block_in_file = folio_pos(folio) >> blkbits;
-       /*
-        * Whole page beyond EOF? Skip allocating blocks to avoid leaking
-        * space.
--- 
-2.39.5
-

diff --git a/queue-6.14/series b/queue-6.14/series
index ccb8e0d13bc3e41e18902e32332d3e358419414e..66fa7f43fb1289732764d2a1824dda0d5d494b97 100644 (file)
--- a/queue-6.14/series
+++ b/queue-6.14/series
@@ -378,7 +378,6 @@ net-stmmac-correct-usage-of-maximum-queue-number-mac.patch
 libbpf-fix-out-of-bound-read.patch
 virtio-break-and-reset-virtio-devices-on-device_shut.patch
 dm-fix-unconditional-io-throttle-caused-by-req_prefl.patch
-fs-mpage-avoid-negative-shift-for-large-blocksize.patch
 gpiolib-sanitize-the-return-value-of-gpio_chip-set_c.patch
 scsi-scsi_debug-first-fixes-for-tapes.patch
 bpf-arm64-silence-ubsan-negation-overflow-warning.patch

diff --git a/queue-6.6/fs-mpage-avoid-negative-shift-for-large-blocksize.patch b/queue-6.6/fs-mpage-avoid-negative-shift-for-large-blocksize.patch
deleted file mode 100644 (file)
index aa2e660..0000000
--- a/queue-6.6/fs-mpage-avoid-negative-shift-for-large-blocksize.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 966dd16171be03ee31a7d390a6802bec42c2e823 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 21 Feb 2025 14:38:18 -0800
-Subject: fs/mpage: avoid negative shift for large blocksize
-
-From: Hannes Reinecke <hare@kernel.org>
-
-[ Upstream commit 86c60efd7c0ede43bd677f2eee1d84200528df1e ]
-
-For large blocksizes the number of block bits is larger than PAGE_SHIFT,
-so calculate the sector number from the byte offset instead. This is
-required to enable large folios with buffer-heads.
-
-Reviewed-by: "Matthew Wilcox (Oracle)" <willy@infradead.org>
-Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
-Signed-off-by: Hannes Reinecke <hare@kernel.org>
-Link: https://lore.kernel.org/r/20250221223823.1680616-4-mcgrof@kernel.org
-Reviewed-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/mpage.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fs/mpage.c b/fs/mpage.c
-index 242e213ee0644..20d95847666b6 100644
---- a/fs/mpage.c
-+++ b/fs/mpage.c
-@@ -189,7 +189,7 @@ static struct bio *do_mpage_readpage(struct mpage_readpage_args *args)
-       if (folio_buffers(folio))
-               goto confused;
- 
--      block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits);
-+      block_in_file = folio_pos(folio) >> blkbits;
-       last_block = block_in_file + args->nr_pages * blocks_per_page;
-       last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits;
-       if (last_block > last_block_in_file)
-@@ -543,7 +543,7 @@ static int __mpage_writepage(struct folio *folio, struct writeback_control *wbc,
-        * The page has no buffers: map it to disk
-        */
-       BUG_ON(!folio_test_uptodate(folio));
--      block_in_file = (sector_t)folio->index << (PAGE_SHIFT - blkbits);
-+      block_in_file = folio_pos(folio) >> blkbits;
-       /*
-        * Whole page beyond EOF? Skip allocating blocks to avoid leaking
-        * space.
--- 
-2.39.5
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 979ae94c2c302f7f7205cda12065a88cc02851f7..dd0a0bee3853ade0d704d28fa0983eaa8e4eb2e6 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -194,7 +194,6 @@ media-adv7180-disable-test-pattern-control-on-adv718.patch
 media-tc358746-improve-calculation-of-the-d-phy-timi.patch
 libbpf-fix-out-of-bound-read.patch
 dm-fix-unconditional-io-throttle-caused-by-req_prefl.patch
-fs-mpage-avoid-negative-shift-for-large-blocksize.patch
 net-mlx5-change-pool_next_size-define-value-and-make.patch
 x86-kaslr-reduce-kaslr-entropy-on-most-x86-systems.patch
 crypto-ahash-set-default-reqsize-from-ahash_alg.patch