[folded-merged] filemap-do-not-use-folio_contains-for-swap-cache-folios-fix.patch removed from -mm tree

[folded-merged] filemap-do-not-use-folio_contains-for-swap-cache-folios-fix.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: filemap-do-not-use-folio_contains-for-swap-cache-folios-fix
has been removed from the -mm tree.  Its filename was
     filemap-do-not-use-folio_contains-for-swap-cache-folios-fix.patch

This patch was dropped because it was folded into filemap-do-not-use-folio_contains-for-swap-cache-folios.patch

------------------------------------------------------
From: Andrew Morton <akpm@linux-foundation.org>
Subject: filemap-do-not-use-folio_contains-for-swap-cache-folios-fix
Date: Wed Apr 30 02:03:35 PM PDT 2025

s/VM_WARN_ON_FOLIO/VM_WARN_ON_ONCE_FOLIO/, per Kairui

Cc: David Hildenbrand <david@redhat.com>
Cc: Kairui Song <kasong@tencent.com>
Cc: Chao Yu <chao@kernel.org>
Cc: Chris Li <chrisl@kernel.org>
Cc: Chris Mason <clm@fb.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: David Sterba <dsterba@suse.com>
Cc: "Huang, Ying" <ying.huang@linux.alibaba.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Joanne Koong <joannelkoong@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Qu Wenruo <wqu@suse.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/pagemap.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/include/linux/pagemap.h~filemap-do-not-use-folio_contains-for-swap-cache-folios-fix
+++ a/include/linux/pagemap.h
@@ -941,7 +941,7 @@ static inline struct page *folio_file_pa
  */
 static inline bool folio_contains(struct folio *folio, pgoff_t index)
 {
-	VM_WARN_ON_FOLIO(folio_test_swapcache(folio), folio);
+	VM_WARN_ON_ONCE_FOLIO(folio_test_swapcache(folio), folio);
 	return index - folio->index < folio_nr_pages(folio);
 }
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

filemap-do-not-use-folio_contains-for-swap-cache-folios.patch
memcontrol-add-ksm_profit-in-cgroup-memoryksm_stat-fix.patch
mm-add-zblock-allocator-fix.patch
mm-add-zblock-allocator-fix-2.patch
mm-add-zblock-allocator-fix-3.patch
mm-zblock-avoid-failing-the-build-fix.patch
revert-x86-mm-remove-unused-__set_memory_prot-fix.patch