drop queue-6.6/revert-mm-filemap-avoid-buffered-read-write-race-to-.patch

diff --git a/queue-6.6/revert-mm-filemap-avoid-buffered-read-write-race-to-.patch b/queue-6.6/revert-mm-filemap-avoid-buffered-read-write-race-to-.patch
deleted file mode 100644 (file)
index 860dcce..0000000
--- a/queue-6.6/revert-mm-filemap-avoid-buffered-read-write-race-to-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e81fe6d081b132172567a5e6dce3d4df609cd87d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 24 Jan 2024 22:28:56 +0800
-Subject: Revert "mm/filemap: avoid buffered read/write race to read
- inconsistent data"
-
-From: Baokun Li <libaokun1@huawei.com>
-
-[ Upstream commit 4b944f8ef99641d5af287c7d9df91d20ef5d3e88 ]
-
-This reverts commit e2c27b803bb6 ("mm/filemap: avoid buffered read/write
-race to read inconsistent data"). After making the i_size_read/write
-helpers be smp_load_acquire/store_release(), it is already guaranteed that
-changes to page contents are visible before we see increased inode size,
-so the extra smp_rmb() in filemap_read() can be removed.
-
-Signed-off-by: Baokun Li <libaokun1@huawei.com>
-Link: https://lore.kernel.org/r/20240124142857.4146716-3-libaokun1@huawei.com
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- mm/filemap.c | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/mm/filemap.c b/mm/filemap.c
-index e6c112f3a211f..cd028f3be6026 100644
---- a/mm/filemap.c
-+++ b/mm/filemap.c
-@@ -2694,15 +2694,6 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter,
-                       goto put_folios;
-               end_offset = min_t(loff_t, isize, iocb->ki_pos + iter->count);
- 
--              /*
--               * Pairs with a barrier in
--               * block_write_end()->mark_buffer_dirty() or other page
--               * dirtying routines like iomap_write_end() to ensure
--               * changes to page contents are visible before we see
--               * increased inode size.
--               */
--              smp_rmb();
--
-               /*
-                * Once we start copying data, we don't want to be touching any
-                * cachelines that might be contended:
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 0dfd1807cee08e958956ef84f583fe8d35519d93..1219273dd013883852a812413be77c3f2a2b8897 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -10,7 +10,6 @@ gfs2-revert-ignore-negated-quota-changes.patch
 riscv-remove-shadow_overflow_stack_size-macro.patch
 net-ethernet-cortina-drop-tso-support.patch
 drm-panel-boe-tv101wum-nl6-fine-tune-himax83102-j02-.patch
-revert-mm-filemap-avoid-buffered-read-write-race-to-.patch
 tracing-remove-precision-vsnprintf-check-from-print-.patch
 alsa-hda-realtek-cs35l41-fix-order-and-duplicates-in.patch
 alsa-hda-realtek-cs35l41-fix-device-id-model-name.patch