Skip to contentSkip to conversation

mm-vmscan-drop-unused-gfp_mask-parameter-from-__node_reclaim.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Aug 7

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: vmscan: drop unused gfp_mask parameter from __node_reclaim()
has been removed from the -mm tree. Its filename was
mm-vmscan-drop-unused-gfp_mask-parameter-from-__node_reclaim.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: Ridong Chen <[email protected]>
Subject: mm: vmscan: drop unused gfp_mask parameter from __node_reclaim()
Date: Fri, 24 Jul 2026 11:34:34 +0800

Commit 57972c78e678 ("mm/vmscan: make __node_reclaim() more generic") moved the scan_control construction out to the callers and passed the struct in by pointer. After that change every use of the gfp mask inside __node_reclaim() goes through sc->gfp_mask, leaving the gfp_mask parameter unused. Just remove the dead parameter and update the callers accordingly. No functional change.

Link https://lore.kernel.org/[email protected] open here
Signed-off-by Ridong Chen <[email protected]>
Acked-by Shakeel Butt <[email protected]>
Acked-by Johannes Weiner <[email protected]>
Reviewed-by Muchun Song <[email protected]>
Reviewed-by Barry Song <[email protected]>
Reviewed-by Qi Zheng <[email protected]>
Cc Axel Rasmussen <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Davidlohr Bueso <[email protected]>
Cc Kairui Song <[email protected]>
Cc Lorenzo Stoakes <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc Wei Xu <[email protected]>
Cc Yuanchu Xie <[email protected]>
Cc Zhongkun He <[email protected]>
Cc Baolin Wang <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 mm/vmscan.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
mm/vmscan.c renamed from mm/vmscan.c~mm-vmscan-drop-unused-gfp_mask-parameter-from-__node_reclaim +4 -5
@@ -7740,7 +7740,7 @@ static unsigned long node_pagecache_recl
 /*
  * Try to free up some pages from this node through reclaim.
  */
-static unsigned long __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask,
+static unsigned long __node_reclaim(struct pglist_data *pgdat,
 				    unsigned long nr_pages,
 				    struct scan_control *sc)
 {

@@ -7832,7 +7832,7 @@ unsigned long node_reclaim(struct pglist
 	if (test_and_set_bit_lock(PGDAT_RECLAIM_LOCKED, &pgdat->flags))
 		return 0;
 
-	ret = __node_reclaim(pgdat, gfp_mask, nr_pages, &sc);
+	ret = __node_reclaim(pgdat, nr_pages, &sc);
 	clear_bit_unlock(PGDAT_RECLAIM_LOCKED, &pgdat->flags);
 
 	if (ret >= nr_pages)

@@ -7845,7 +7845,7 @@ unsigned long node_reclaim(struct pglist
 
 #else
 
-static unsigned long __node_reclaim(struct pglist_data *pgdat, gfp_t gfp_mask,
+static unsigned long __node_reclaim(struct pglist_data *pgdat,
 				    unsigned long nr_pages,
 				    struct scan_control *sc)
 {

@@ -7958,8 +7958,7 @@ int user_proactive_reclaim(char *buf,
 						  &pgdat->flags))
 				return -EBUSY;
 
-			reclaimed = __node_reclaim(pgdat, gfp_mask,
-						   batch_size, &sc);
+			reclaimed = __node_reclaim(pgdat, batch_size, &sc);
 			clear_bit_unlock(PGDAT_RECLAIM_LOCKED, &pgdat->flags);
 		}

_

Patches currently in -mm which might be from [email protected] are

memcg-move-mem_cgroup_swappiness-and-vm_swappiness-to-mm-swaph.patch mm-vmscan-fix-node-reclaim-ignoring-swappiness-parameter.patch