mm: migrate: remove unused argument vma from migrate_misplaced_folio()

Commit ee86814b0562 ("mm/migrate: move NUMA hinting fault folio isolation
+ checks under PTL") removed the code that had used the vma argument in
migrate_misplaced_folio.

Since the vma argument was no longer used in migrate_misplaced_folio, this
patch removes it.

Link: https://lkml.kernel.org/r/20241126155655.466186-1-donettom@linux.ibm.com
Signed-off-by: Donet Tom <donettom@linux.ibm.com>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index 002e49b2ebd98ea3a00e9a46e34bbb4a3b97eb58..29919faea2f10e97748a1f80bd09fe57966a7d62 100644 (file)
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -144,16 +144,14 @@ const struct movable_operations *page_movable_ops(struct page *page)
 #ifdef CONFIG_NUMA_BALANCING
 int migrate_misplaced_folio_prepare(struct folio *folio,
                struct vm_area_struct *vma, int node);
-int migrate_misplaced_folio(struct folio *folio, struct vm_area_struct *vma,
-                          int node);
+int migrate_misplaced_folio(struct folio *folio, int node);
 #else
 static inline int migrate_misplaced_folio_prepare(struct folio *folio,
                struct vm_area_struct *vma, int node)
 {
        return -EAGAIN; /* can't migrate now */
 }
-static inline int migrate_misplaced_folio(struct folio *folio,
-                                        struct vm_area_struct *vma, int node)
+static inline int migrate_misplaced_folio(struct folio *folio, int node)
 {
        return -EAGAIN; /* can't migrate now */
 }

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index db64116a4f84899d719e8fae688e29a2bd771cd3..45901dc6710c9228ca9476c28a86ea3231233c03 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2003,7 +2003,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf)
        spin_unlock(vmf->ptl);
        writable = false;
 
-       if (!migrate_misplaced_folio(folio, vma, target_nid)) {
+       if (!migrate_misplaced_folio(folio, target_nid)) {
                flags |= TNF_MIGRATED;
                nid = target_nid;
                task_numa_fault(last_cpupid, nid, HPAGE_PMD_NR, flags);

diff --git a/mm/memory.c b/mm/memory.c
index 398c031be9baab83978c533f80b62c4d81073bb9..78b6741ae593af067e918594e830a32ab4a3e39e 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5625,7 +5625,7 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf)
        ignore_writable = true;
 
        /* Migrate to the requested node */
-       if (!migrate_misplaced_folio(folio, vma, target_nid)) {
+       if (!migrate_misplaced_folio(folio, target_nid)) {
                nid = target_nid;
                flags |= TNF_MIGRATED;
                task_numa_fault(last_cpupid, nid, nr_pages, flags);

diff --git a/mm/migrate.c b/mm/migrate.c
index cc68583c86f961e81e1b4d69643f2027767e0670..e9e00d1d1d19b19ba131b993e765153744c056c8 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -2683,8 +2683,7 @@ int migrate_misplaced_folio_prepare(struct folio *folio,
  * elevated reference count on the folio. This function will un-isolate the
  * folio, dereferencing the folio before returning.
  */
-int migrate_misplaced_folio(struct folio *folio, struct vm_area_struct *vma,
-                           int node)
+int migrate_misplaced_folio(struct folio *folio, int node)
 {
        pg_data_t *pgdat = NODE_DATA(node);
        int nr_remaining;