diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2025-02-13 18:23:01 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2025-03-18 00:15:25 -0400 |
| commit | 08be56fec0588972f6fd4a3ce4ced3265de43dd8 (patch) | |
| tree | 2537904d7e337c87abb44cb3d78d59188fd7bc96 | |
| parent | 7e91ae31e2d264155dfd102101afc2de7bd74a64 (diff) | |
| download | linux-stable-08be56fec0588972f6fd4a3ce4ced3265de43dd8.tar.gz linux-stable-08be56fec0588972f6fd4a3ce4ced3265de43dd8.tar.bz2 linux-stable-08be56fec0588972f6fd4a3ce4ced3265de43dd8.zip | |
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>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20250213182303.2133205-1-willy@infradead.org
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | fs/ext4/inode.c | 2 | ||||
| -rw-r--r-- | fs/ext4/super.c | 2 | ||||
| -rw-r--r-- | fs/jbd2/journal.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index f5c6937c2ebc..aede80fa1781 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -752,7 +752,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 cdc435af1088..fec729bc287e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -7306,7 +7306,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 51f7a8cc43a7..ff41a31e2bc9 100644 --- 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. */ |