The quilt patch titled
Subject: mm-vmscan-fix-a-lot-of-comments-vs-mglru
has been removed from the -mm tree. Its filename was
mm-vmscan-fix-a-lot-of-comments-vs-mglru.patch
This patch was dropped because it was folded into mm-vmscan-fix-a-lot-of-comments.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-vmscan-fix-a-lot-of-comments-vs-mglru
Date: Fri Sep 2 03:39:50 PM PDT 2022
fixups for mglru additions
Cc: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx>
Cc: Yu Zhao <yuzhao@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/vmscan.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--- a/mm/vmscan.c~mm-vmscan-fix-a-lot-of-comments-vs-mglru
+++ a/mm/vmscan.c
@@ -3644,7 +3644,7 @@ static int folio_update_gen(struct folio
do {
/* lru_gen_del_folio() has isolated this page? */
if (!(old_flags & LRU_GEN_MASK)) {
- /* for shrink_page_list() */
+ /* for shrink_folio_list() */
new_flags = old_flags | BIT(PG_referenced);
continue;
}
@@ -4571,7 +4571,7 @@ static void lru_gen_age_node(struct pgli
}
/*
- * This function exploits spatial locality when shrink_page_list() walks the
+ * This function exploits spatial locality when shrink_folio_list() walks the
* rmap. It scans the adjacent PTEs of a young PTE and promotes hot pages. If
* the scan was done cacheline efficiently, it adds the PMD entry pointing to
* the PTE table to the Bloom filter. This forms a feedback loop between the
@@ -4792,7 +4792,7 @@ static bool isolate_folio(struct lruvec
if (!folio_test_referenced(folio))
set_mask_bits(&folio->flags, LRU_REFS_MASK | LRU_REFS_FLAGS, 0);
- /* for shrink_page_list() */
+ /* for shrink_folio_list() */
folio_clear_reclaim(folio);
folio_clear_referenced(folio);
@@ -4995,7 +4995,7 @@ static int evict_folios(struct lruvec *l
if (list_empty(&list))
return scanned;
- reclaimed = shrink_page_list(&list, pgdat, sc, &stat, false);
+ reclaimed = shrink_folio_list(&list, pgdat, sc, &stat, false);
list_for_each_entry(folio, &list, lru) {
/* restore LRU_REFS_FLAGS cleared by isolate_folio() */
@@ -5012,7 +5012,7 @@ static int evict_folios(struct lruvec *l
spin_lock_irq(&lruvec->lru_lock);
- move_pages_to_lru(lruvec, &list);
+ move_folios_to_lru(lruvec, &list);
walk = current->reclaim_state->mm_walk;
if (walk && walk->batched)
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-vmscan-fix-a-lot-of-comments.patch
swap-add-swap_cache_get_folio-fix.patch
memcg-reduce-size-of-memcg-vmstats-structures-fix.patch
mm-damon-vaddr-add-a-comment-for-default-case-in-damon_va_apply_scheme-fix.patch
mm-page_allocc-rename-check_free_page-to-free_page_is_bad.patch
mm-page_allocc-rename-check_free_page-to-free_page_is_bad-fix.patch
mm-page_allocc-document-bulkfree_pcp_prepare-return-value.patch
fs-uninline-inode_maybe_inc_iversion.patch
ipc-msg-mitigate-the-lock-contention-with-percpu-counter-checkpatch-fixes.patch
ipc-msg-mitigate-the-lock-contention-with-percpu-counter-fix-fix.patch
