[merged mm-stable] mm-zswap-reuse-zswap_invalidate-in-zswap_store.patch removed from -mm tree

[merged mm-stable] mm-zswap-reuse-zswap_invalidate-in-zswap_store.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm: zswap: reuse zswap_invalidate() in zswap_store()
has been removed from the -mm tree.  Its filename was
     mm-zswap-reuse-zswap_invalidate-in-zswap_store.patch

This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: mm: zswap: reuse zswap_invalidate() in zswap_store()
Date: Thu, 10 Sep 2026 20:35:44 +0800

Reuse zswap_invalidate() in zswap_store() check_old path.  Its
zswap_never_enabled() and xa_empty() guards avoid redundant xarray lookups
and deduplicate the per-slot free logic.

Link: https://lore.kernel.org/20260910123544.818146-4-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Yosry Ahmed <yosry@kernel.org>
Reviewed-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Kairui Song <kasong@tencent.com>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
---

 mm/zswap.c |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

--- a/mm/zswap.c~mm-zswap-reuse-zswap_invalidate-in-zswap_store
+++ a/mm/zswap.c
@@ -1543,19 +1543,8 @@ check_old:
 	 * offsets corresponding to each page of the folio. Otherwise,
 	 * writeback could overwrite the new data in the swapfile.
 	 */
-	if (!ret) {
-		unsigned type = swp_type(swp);
-		pgoff_t offset = swp_offset(swp);
-		struct zswap_entry *entry;
-		struct xarray *tree;
-
-		for (index = 0; index < nr_pages; ++index) {
-			tree = swap_zswap_tree(swp_entry(type, offset + index));
-			entry = xa_erase(tree, offset + index);
-			if (entry)
-				zswap_entry_free(entry);
-		}
-	}
+	if (!ret)
+		zswap_invalidate(swp_type(swp), swp_offset(swp), nr_pages);
 
 	return ret;
 }
_

Patches currently in -mm which might be from wangkefeng.wang@huawei.com are

mm-mincore-use-per-vma-lock-during-page-table-walk.patch