mm/page_alloc: don't pass pfn to free_unref_page_commit()
authorNicolas Saenz Julienne <nsaenzju@redhat.com>
Tue, 22 Mar 2022 21:43:14 +0000 (14:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Mar 2022 22:57:05 +0000 (15:57 -0700)
free_unref_page_commit() doesn't make use of its pfn argument, so get
rid of it.

Link: https://lkml.kernel.org/r/20220202140451.415928-1-nsaenzju@redhat.com
Signed-off-by: Nicolas Saenz Julienne <nsaenzju@redhat.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/page_alloc.c

index 82f8226b1180770b57dcccd830219cb65a6527f6..06c683754334a9caba3f0f716b423dfebcfbbcce 100644 (file)
@@ -3366,8 +3366,8 @@ static int nr_pcp_high(struct per_cpu_pages *pcp, struct zone *zone)
        return min(READ_ONCE(pcp->batch) << 2, high);
 }
 
-static void free_unref_page_commit(struct page *page, unsigned long pfn,
-                                  int migratetype, unsigned int order)
+static void free_unref_page_commit(struct page *page, int migratetype,
+                                  unsigned int order)
 {
        struct zone *zone = page_zone(page);
        struct per_cpu_pages *pcp;
@@ -3416,7 +3416,7 @@ void free_unref_page(struct page *page, unsigned int order)
        }
 
        local_lock_irqsave(&pagesets.lock, flags);
-       free_unref_page_commit(page, pfn, migratetype, order);
+       free_unref_page_commit(page, migratetype, order);
        local_unlock_irqrestore(&pagesets.lock, flags);
 }
 
@@ -3426,13 +3426,13 @@ void free_unref_page(struct page *page, unsigned int order)
 void free_unref_page_list(struct list_head *list)
 {
        struct page *page, *next;
-       unsigned long flags, pfn;
+       unsigned long flags;
        int batch_count = 0;
        int migratetype;
 
        /* Prepare pages for freeing */
        list_for_each_entry_safe(page, next, list, lru) {
-               pfn = page_to_pfn(page);
+               unsigned long pfn = page_to_pfn(page);
                if (!free_unref_page_prepare(page, pfn, 0)) {
                        list_del(&page->lru);
                        continue;
@@ -3448,15 +3448,10 @@ void free_unref_page_list(struct list_head *list)
                        free_one_page(page_zone(page), page, pfn, 0, migratetype, FPI_NONE);
                        continue;
                }
-
-               set_page_private(page, pfn);
        }
 
        local_lock_irqsave(&pagesets.lock, flags);
        list_for_each_entry_safe(page, next, list, lru) {
-               pfn = page_private(page);
-               set_page_private(page, 0);
-
                /*
                 * Non-isolated types over MIGRATE_PCPTYPES get added
                 * to the MIGRATE_MOVABLE pcp list.
@@ -3466,7 +3461,7 @@ void free_unref_page_list(struct list_head *list)
                        migratetype = MIGRATE_MOVABLE;
 
                trace_mm_page_free_batched(page);
-               free_unref_page_commit(page, pfn, migratetype, 0);
+               free_unref_page_commit(page, migratetype, 0);
 
                /*
                 * Guard against excessive IRQ disabled times when we get