ext4: Remove references to bh->b_page

Buffer heads are attached to folios, not to pages.  Also
flush_dcache_page() is now deprecated in favour of flush_dcache_folio().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 7c54ae5fcbd4540e8ba69b942ffd98dded320339..bd579f46c7f3602dea9197b55efcdb232d60f72f 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -751,7 +751,7 @@ static void ext4_update_bh_state(struct buffer_head *bh, unsigned long flags)
        flags &= EXT4_MAP_FLAGS;
 
        /* Dummy buffer_head? Set non-atomically. */
-       if (!bh->b_page) {
+       if (!bh->b_folio) {
                bh->b_state = (bh->b_state & ~EXT4_MAP_FLAGS) | flags;
                return;
        }

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index a50e5c31b937820ce6d178c28800e380da3f5bed..366ce891bcc3afa894c0c33248233d774da474f2 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -7288,7 +7288,7 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
        }
        lock_buffer(bh);
        memcpy(bh->b_data+offset, data, len);
-       flush_dcache_page(bh->b_page);
+       flush_dcache_folio(bh->b_folio);
        unlock_buffer(bh);
        err = ext4_handle_dirty_metadata(handle, NULL, bh);
        brelse(bh);

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index d8084b31b3610a446a03089e7564806e8588f2fc..e5a4e4ba78373697e8445cf5a94d1993e8c929bf 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -947,7 +947,7 @@ int jbd2_journal_bmap(journal_t *journal, unsigned long blocknr,
  * descriptor blocks we do need to generate bona fide buffers.
  *
  * After the caller of jbd2_journal_get_descriptor_buffer() has finished modifying
- * the buffer's contents they really should run flush_dcache_page(bh->b_page).
+ * the buffer's contents they really should run flush_dcache_folio(bh->b_folio).
  * But we don't bother doing that, so there will be coherency problems with
  * mmaps of blockdevs which hold live JBD-controlled filesystems.
  */