ceph: Remove call to PagePrivate2()

Use the folio that we already have to call folio_test_private_2()
instead.  This is the last call to PagePrivate2(), so replace its
PAGEFLAG() definition with FOLIO_FLAG().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Link: https://lore.kernel.org/r/20241002040111.1023018-6-willy@infradead.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 53fef258c2bc6ab961cf8fb44e59869c1a29737e..a8788e300dc74910a6fc72130a486d83d5983991 100644 (file)
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -1051,7 +1051,9 @@ get_more_pages:
                if (!nr_folios && !locked_pages)
                        break;
                for (i = 0; i < nr_folios && locked_pages < max_pages; i++) {
-                       page = &fbatch.folios[i]->page;
+                       struct folio *folio = fbatch.folios[i];
+
+                       page = &folio->page;
                        doutc(cl, "? %p idx %lu\n", page, page->index);
                        if (locked_pages == 0)
                                lock_page(page);  /* first page */
@@ -1078,8 +1080,6 @@ get_more_pages:
                                continue;
                        }
                        if (page_offset(page) >= ceph_wbc.i_size) {
-                               struct folio *folio = page_folio(page);
-
                                doutc(cl, "folio at %lu beyond eof %llu\n",
                                      folio->index, ceph_wbc.i_size);
                                if ((ceph_wbc.size_stable ||
@@ -1095,16 +1095,16 @@ get_more_pages:
                                unlock_page(page);
                                break;
                        }
-                       if (PageWriteback(page) ||
-                           PagePrivate2(page) /* [DEPRECATED] */) {
+                       if (folio_test_writeback(folio) ||
+                           folio_test_private_2(folio) /* [DEPRECATED] */) {
                                if (wbc->sync_mode == WB_SYNC_NONE) {
-                                       doutc(cl, "%p under writeback\n", page);
-                                       unlock_page(page);
+                                       doutc(cl, "%p under writeback\n", folio);
+                                       folio_unlock(folio);
                                        continue;
                                }
-                               doutc(cl, "waiting on writeback %p\n", page);
-                               wait_on_page_writeback(page);
-                               folio_wait_private_2(page_folio(page)); /* [DEPRECATED] */
+                               doutc(cl, "waiting on writeback %p\n", folio);
+                               folio_wait_writeback(folio);
+                               folio_wait_private_2(folio); /* [DEPRECATED] */
                        }
 
                        if (!clear_page_dirty_for_io(page)) {

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 35d08c30d4a630dc578f9da23f31358b2649897b..4c2dfe28904662ac5df47fe800c73327f4ef0fb0 100644 (file)
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -543,7 +543,7 @@ FOLIO_FLAG(swapbacked, FOLIO_HEAD_PAGE)
  * - PG_private and PG_private_2 cause release_folio() and co to be invoked
  */
 PAGEFLAG(Private, private, PF_ANY)
-PAGEFLAG(Private2, private_2, PF_ANY) TESTSCFLAG(Private2, private_2, PF_ANY)
+FOLIO_FLAG(private_2, FOLIO_HEAD_PAGE)
 
 /* owner_2 can be set on tail pages for anon memory */
 FOLIO_FLAG(owner_2, FOLIO_HEAD_PAGE)