nilfs2: convert to nilfs_clear_folio_dirty()

All callers of nilfs_clear_dirty_page() now have a folio, so rename the
function and pass in the folio.  Saves three hidden calls to
compound_head().

Link: https://lkml.kernel.org/r/20231114084436.2755-9-konishi.ryusuke@gmail.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index c7ec56358a793e0665bce59bf96705c9e42c7ac7..8fe784f627204950d7bb54b9f94ffa4e5c9422e6 100644 (file)
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -186,7 +186,7 @@ static int nilfs_writepage(struct page *page, struct writeback_control *wbc)
                 * have dirty pages that try to be flushed in background.
                 * So, here we simply discard this dirty page.
                 */
-               nilfs_clear_dirty_page(page, false);
+               nilfs_clear_folio_dirty(folio, false);
                folio_unlock(folio);
                return -EROFS;
        }

diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
index 327408512b869d8b8cecbab39e62460f34d9caec..2e7952ac2f673e96a5fdc346c1693f375cd769fa 100644 (file)
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
@@ -411,7 +411,7 @@ nilfs_mdt_write_page(struct page *page, struct writeback_control *wbc)
                 * have dirty folios that try to be flushed in background.
                 * So, here we simply discard this dirty folio.
                 */
-               nilfs_clear_dirty_page(page, false);
+               nilfs_clear_folio_dirty(folio, false);
                folio_unlock(folio);
                return -EROFS;
        }

diff --git a/fs/nilfs2/page.c b/fs/nilfs2/page.c
index 29799a49c234df1a2f098b1d9f805839c1c50532..48a91ff059f56470ce899c612e33de62aead5dea 100644 (file)
--- a/fs/nilfs2/page.c
+++ b/fs/nilfs2/page.c
@@ -379,7 +379,7 @@ void nilfs_clear_dirty_pages(struct address_space *mapping, bool silent)
                         * was acquired.  Skip processing in that case.
                         */
                        if (likely(folio->mapping == mapping))
-                               nilfs_clear_dirty_page(&folio->page, silent);
+                               nilfs_clear_folio_dirty(folio, silent);
 
                        folio_unlock(folio);
                }
@@ -389,32 +389,33 @@ void nilfs_clear_dirty_pages(struct address_space *mapping, bool silent)
 }
 
 /**
- * nilfs_clear_dirty_page - discard dirty page
- * @page: dirty page that will be discarded
+ * nilfs_clear_folio_dirty - discard dirty folio
+ * @folio: dirty folio that will be discarded
  * @silent: suppress [true] or print [false] warning messages
  */
-void nilfs_clear_dirty_page(struct page *page, bool silent)
+void nilfs_clear_folio_dirty(struct folio *folio, bool silent)
 {
-       struct inode *inode = page->mapping->host;
+       struct inode *inode = folio->mapping->host;
        struct super_block *sb = inode->i_sb;
+       struct buffer_head *bh, *head;
 
-       BUG_ON(!PageLocked(page));
+       BUG_ON(!folio_test_locked(folio));
 
        if (!silent)
                nilfs_warn(sb, "discard dirty page: offset=%lld, ino=%lu",
-                          page_offset(page), inode->i_ino);
+                          folio_pos(folio), inode->i_ino);
 
-       ClearPageUptodate(page);
-       ClearPageMappedToDisk(page);
+       folio_clear_uptodate(folio);
+       folio_clear_mappedtodisk(folio);
 
-       if (page_has_buffers(page)) {
-               struct buffer_head *bh, *head;
+       head = folio_buffers(folio);
+       if (head) {
                const unsigned long clear_bits =
                        (BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) |
                         BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) |
                         BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected));
 
-               bh = head = page_buffers(page);
+               bh = head;
                do {
                        lock_buffer(bh);
                        if (!silent)
@@ -427,7 +428,7 @@ void nilfs_clear_dirty_page(struct page *page, bool silent)
                } while (bh = bh->b_this_page, bh != head);
        }
 
-       __nilfs_clear_page_dirty(page);
+       __nilfs_clear_page_dirty(&folio->page);
 }
 
 unsigned int nilfs_page_count_clean_buffers(struct page *page,

diff --git a/fs/nilfs2/page.h b/fs/nilfs2/page.h
index a8ab800e689c6e9d22ccbf9a52a8efd30b2787d7..c419bb1f5b7df6388448289e2f6c31eb777b059c 100644 (file)
--- a/fs/nilfs2/page.h
+++ b/fs/nilfs2/page.h
@@ -41,7 +41,7 @@ void nilfs_page_bug(struct page *);
 
 int nilfs_copy_dirty_pages(struct address_space *, struct address_space *);
 void nilfs_copy_back_pages(struct address_space *, struct address_space *);
-void nilfs_clear_dirty_page(struct page *, bool);
+void nilfs_clear_folio_dirty(struct folio *, bool);
 void nilfs_clear_dirty_pages(struct address_space *, bool);
 unsigned int nilfs_page_count_clean_buffers(struct page *, unsigned int,
                                            unsigned int);