nilfs2: convert nilfs_copy_page() to nilfs_copy_folio()

Both callers already have a folio, so pass it in and use it directly.
Removes a lot of hidden calls to compound_head().

Link: https://lkml.kernel.org/r/20231016201114.1928083-13-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Cc: Pankaj Raghav <p.raghav@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
index 1c075bd..696215d 100644 (file)
--- a/fs/nilfs2/page.c
+++ b/fs/nilfs2/page.c
@@ -184,30 +184,32 @@ void nilfs_page_bug(struct page *page)
 }
 
 /**
- * nilfs_copy_page -- copy the page with buffers
- * @dst: destination page
- * @src: source page
- * @copy_dirty: flag whether to copy dirty states on the page's buffer heads.
+ * nilfs_copy_folio -- copy the folio with buffers
+ * @dst: destination folio
+ * @src: source folio
+ * @copy_dirty: flag whether to copy dirty states on the folio's buffer heads.
  *
- * This function is for both data pages and btnode pages.  The dirty flag
- * should be treated by caller.  The page must not be under i/o.
- * Both src and dst page must be locked
+ * This function is for both data folios and btnode folios.  The dirty flag
+ * should be treated by caller.  The folio must not be under i/o.
+ * Both src and dst folio must be locked
  */
-static void nilfs_copy_page(struct page *dst, struct page *src, int copy_dirty)
+static void nilfs_copy_folio(struct folio *dst, struct folio *src,
+               bool copy_dirty)
 {
        struct buffer_head *dbh, *dbufs, *sbh;
        unsigned long mask = NILFS_BUFFER_INHERENT_BITS;
 
-       BUG_ON(PageWriteback(dst));
+       BUG_ON(folio_test_writeback(dst));
 
-       sbh = page_buffers(src);
-       if (!page_has_buffers(dst))
-               create_empty_buffers(dst, sbh->b_size, 0);
+       sbh = folio_buffers(src);
+       dbh = folio_buffers(dst);
+       if (!dbh)
+               dbh = folio_create_empty_buffers(dst, sbh->b_size, 0);
 
        if (copy_dirty)
                mask |= BIT(BH_Dirty);
 
-       dbh = dbufs = page_buffers(dst);
+       dbufs = dbh;
        do {
                lock_buffer(sbh);
                lock_buffer(dbh);
@@ -218,16 +220,16 @@ static void nilfs_copy_page(struct page *dst, struct page *src, int copy_dirty)
                dbh = dbh->b_this_page;
        } while (dbh != dbufs);
 
-       copy_highpage(dst, src);
+       folio_copy(dst, src);
 
-       if (PageUptodate(src) && !PageUptodate(dst))
-               SetPageUptodate(dst);
-       else if (!PageUptodate(src) && PageUptodate(dst))
-               ClearPageUptodate(dst);
-       if (PageMappedToDisk(src) && !PageMappedToDisk(dst))
-               SetPageMappedToDisk(dst);
-       else if (!PageMappedToDisk(src) && PageMappedToDisk(dst))
-               ClearPageMappedToDisk(dst);
+       if (folio_test_uptodate(src) && !folio_test_uptodate(dst))
+               folio_mark_uptodate(dst);
+       else if (!folio_test_uptodate(src) && folio_test_uptodate(dst))
+               folio_clear_uptodate(dst);
+       if (folio_test_mappedtodisk(src) && !folio_test_mappedtodisk(dst))
+               folio_set_mappedtodisk(dst);
+       else if (!folio_test_mappedtodisk(src) && folio_test_mappedtodisk(dst))
+               folio_clear_mappedtodisk(dst);
 
        do {
                unlock_buffer(sbh);
@@ -269,7 +271,7 @@ repeat:
                        NILFS_PAGE_BUG(&folio->page,
                                       "found empty page in dat page cache");
 
-               nilfs_copy_page(&dfolio->page, &folio->page, 1);
+               nilfs_copy_folio(dfolio, folio, true);
                filemap_dirty_folio(folio_mapping(dfolio), dfolio);
 
                folio_unlock(dfolio);
@@ -314,7 +316,7 @@ repeat:
                if (!IS_ERR(dfolio)) {
                        /* overwrite existing folio in the destination cache */
                        WARN_ON(folio_test_dirty(dfolio));
-                       nilfs_copy_page(&dfolio->page, &folio->page, 0);
+                       nilfs_copy_folio(dfolio, folio, false);
                        folio_unlock(dfolio);
                        folio_put(dfolio);
                        /* Do we not need to remove folio from smap here? */

diff --git a/mm/util.c b/mm/util.c
index 8cbbfd3..eefa033 100644 (file)
--- a/mm/util.c
+++ b/mm/util.c
@@ -799,6 +799,7 @@ void folio_copy(struct folio *dst, struct folio *src)
                cond_resched();
        }
 }
+EXPORT_SYMBOL(folio_copy);
 
 int sysctl_overcommit_memory __read_mostly = OVERCOMMIT_GUESS;
 int sysctl_overcommit_ratio __read_mostly = 50;