mm/mempolicy: convert queue_pages_required() to queue_folio_required()
authorVishal Moola (Oracle) <vishal.moola@gmail.com>
Mon, 30 Jan 2023 20:18:32 +0000 (12:18 -0800)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 13 Feb 2023 23:54:31 +0000 (15:54 -0800)
Replace queue_pages_required() with queue_folio_required().
queue_folio_required() does the same as queue_pages_required(), except
takes in a folio instead of a page.

Link: https://lkml.kernel.org/r/20230130201833.27042-6-vishal.moola@gmail.com
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Jane Chu <jane.chu@oracle.com>
Cc: "Yin, Fengwei" <fengwei.yin@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/mempolicy.c

index 66839249350005fdf72e2d851d1268699f0b2225..6a68dbce3b703421f554695d37dc86a0e2fc5083 100644 (file)
@@ -427,15 +427,15 @@ struct queue_pages {
 };
 
 /*
- * Check if the page's nid is in qp->nmask.
+ * Check if the folio's nid is in qp->nmask.
  *
  * If MPOL_MF_INVERT is set in qp->flags, check if the nid is
  * in the invert of qp->nmask.
  */
-static inline bool queue_pages_required(struct page *page,
+static inline bool queue_folio_required(struct folio *folio,
                                        struct queue_pages *qp)
 {
-       int nid = page_to_nid(page);
+       int nid = folio_nid(folio);
        unsigned long flags = qp->flags;
 
        return node_isset(nid, *qp->nmask) == !(flags & MPOL_MF_INVERT);
@@ -469,7 +469,7 @@ static int queue_folios_pmd(pmd_t *pmd, spinlock_t *ptl, unsigned long addr,
                walk->action = ACTION_CONTINUE;
                goto unlock;
        }
-       if (!queue_pages_required(&folio->page, qp))
+       if (!queue_folio_required(folio, qp))
                goto unlock;
 
        flags = qp->flags;
@@ -530,7 +530,7 @@ static int queue_folios_pte_range(pmd_t *pmd, unsigned long addr,
                 */
                if (folio_test_reserved(folio))
                        continue;
-               if (!queue_pages_required(&folio->page, qp))
+               if (!queue_folio_required(folio, qp))
                        continue;
                if (flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)) {
                        /* MPOL_MF_STRICT must be specified if we get here */
@@ -575,7 +575,7 @@ static int queue_folios_hugetlb(pte_t *pte, unsigned long hmask,
        if (!pte_present(entry))
                goto unlock;
        folio = pfn_folio(pte_pfn(entry));
-       if (!queue_pages_required(&folio->page, qp))
+       if (!queue_folio_required(folio, qp))
                goto unlock;
 
        if (flags == MPOL_MF_STRICT) {