Linux 6.9-rc1

[linux-2.6-microblaze.git] / mm / gup_test.c

diff --git a/mm/gup_test.c b/mm/gup_test.c
index c0421b7..eeb3f4d 100644 (file)
--- a/mm/gup_test.c
+++ b/mm/gup_test.c
@@ -40,24 +40,25 @@ static void verify_dma_pinned(unsigned int cmd, struct page **pages,
                              unsigned long nr_pages)
 {
        unsigned long i;
-       struct page *page;
+       struct folio *folio;
 
        switch (cmd) {
        case PIN_FAST_BENCHMARK:
        case PIN_BASIC_TEST:
        case PIN_LONGTERM_BENCHMARK:
                for (i = 0; i < nr_pages; i++) {
-                       page = pages[i];
-                       if (WARN(!page_maybe_dma_pinned(page),
+                       folio = page_folio(pages[i]);
+
+                       if (WARN(!folio_maybe_dma_pinned(folio),
                                 "pages[%lu] is NOT dma-pinned\n", i)) {
 
-                               dump_page(page, "gup_test failure");
+                               dump_page(&folio->page, "gup_test failure");
                                break;
                        } else if (cmd == PIN_LONGTERM_BENCHMARK &&
-                               WARN(!is_longterm_pinnable_page(page),
+                               WARN(!folio_is_longterm_pinnable(folio),
                                     "pages[%lu] is NOT pinnable but pinned\n",
                                     i)) {
-                               dump_page(page, "gup_test failure");
+                               dump_page(&folio->page, "gup_test failure");
                                break;
                        }
                }
@@ -139,29 +140,27 @@ static int __gup_test_ioctl(unsigned int cmd,
                                                 pages + i);
                        break;
                case GUP_BASIC_TEST:
-                       nr = get_user_pages(addr, nr, gup->gup_flags, pages + i,
-                                           NULL);
+                       nr = get_user_pages(addr, nr, gup->gup_flags, pages + i);
                        break;
                case PIN_FAST_BENCHMARK:
                        nr = pin_user_pages_fast(addr, nr, gup->gup_flags,
                                                 pages + i);
                        break;
                case PIN_BASIC_TEST:
-                       nr = pin_user_pages(addr, nr, gup->gup_flags, pages + i,
-                                           NULL);
+                       nr = pin_user_pages(addr, nr, gup->gup_flags, pages + i);
                        break;
                case PIN_LONGTERM_BENCHMARK:
                        nr = pin_user_pages(addr, nr,
                                            gup->gup_flags | FOLL_LONGTERM,
-                                           pages + i, NULL);
+                                           pages + i);
                        break;
                case DUMP_USER_PAGES_TEST:
                        if (gup->test_flags & GUP_TEST_FLAG_DUMP_PAGES_USE_PIN)
                                nr = pin_user_pages(addr, nr, gup->gup_flags,
-                                                   pages + i, NULL);
+                                                   pages + i);
                        else
                                nr = get_user_pages(addr, nr, gup->gup_flags,
-                                                   pages + i, NULL);
+                                                   pages + i);
                        break;
                default:
                        ret = -EINVAL;
@@ -271,7 +270,7 @@ static inline int pin_longterm_test_start(unsigned long arg)
                                                        gup_flags, pages);
                else
                        cur_pages = pin_user_pages(addr, remaining_pages,
-                                                  gup_flags, pages, NULL);
+                                                  gup_flags, pages);
                if (cur_pages < 0) {
                        pin_longterm_test_stop();
                        ret = cur_pages;