jbd2: replace obvious uses of b_page with b_folio

These places just use b_page to get to the buffer's address_space or have
already been converted to folio.

Link: https://lkml.kernel.org/r/20221215214402.3522366-10-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 4810438b7856aa39710b6b8d9eb6fee1f3b6c8b1..96a1ebc6342db1b36d17298d8b36176ecc9e62ce 100644 (file)
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -63,16 +63,12 @@ static void journal_end_buffer_io_sync(struct buffer_head *bh, int uptodate)
 static void release_buffer_page(struct buffer_head *bh)
 {
        struct folio *folio;
-       struct page *page;
 
        if (buffer_dirty(bh))
                goto nope;
        if (atomic_read(&bh->b_count) != 1)
                goto nope;
-       page = bh->b_page;
-       if (!page)
-               goto nope;
-       folio = page_folio(page);
+       folio = bh->b_folio;
        if (folio->mapping)
                goto nope;
 
@@ -1040,7 +1036,7 @@ restart_loop:
                         * already detached from the mapping and buffers cannot
                         * get reused.
                         */
-                       mapping = READ_ONCE(bh->b_page->mapping);
+                       mapping = READ_ONCE(bh->b_folio->mapping);
                        if (mapping && !sb_is_blkdev_sb(mapping->host->i_sb)) {
                                clear_buffer_mapped(bh);
                                clear_buffer_new(bh);

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 2696f43e7239f809bcc1ff7b784ea51d94fa6f99..4095fe91457fdcb7a5b1ee13a1c1e39bee2a7857 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2938,7 +2938,7 @@ repeat:
        } else {
                J_ASSERT_BH(bh,
                        (atomic_read(&bh->b_count) > 0) ||
-                       (bh->b_page && bh->b_page->mapping));
+                       (bh->b_folio && bh->b_folio->mapping));
 
                if (!new_jh) {
                        jbd_unlock_bh_journal_head(bh);