Skip to content

Commit 08be56f

Browse files
Matthew Wilcox (Oracle)tytso
authored andcommitted
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) <[email protected]> Reviewed-by: Jan Kara <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Theodore Ts'o <[email protected]>
1 parent 7e91ae3 commit 08be56f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

fs/ext4/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ static void ext4_update_bh_state(struct buffer_head *bh, unsigned long flags)
752752
flags &= EXT4_MAP_FLAGS;
753753

754754
/* Dummy buffer_head? Set non-atomically. */
755-
if (!bh->b_page) {
755+
if (!bh->b_folio) {
756756
bh->b_state = (bh->b_state & ~EXT4_MAP_FLAGS) | flags;
757757
return;
758758
}

fs/ext4/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7306,7 +7306,7 @@ static ssize_t ext4_quota_write(struct super_block *sb, int type,
73067306
}
73077307
lock_buffer(bh);
73087308
memcpy(bh->b_data+offset, data, len);
7309-
flush_dcache_page(bh->b_page);
7309+
flush_dcache_folio(bh->b_folio);
73107310
unlock_buffer(bh);
73117311
err = ext4_handle_dirty_metadata(handle, NULL, bh);
73127312
brelse(bh);

fs/jbd2/journal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ int jbd2_journal_bmap(journal_t *journal, unsigned long blocknr,
947947
* descriptor blocks we do need to generate bona fide buffers.
948948
*
949949
* After the caller of jbd2_journal_get_descriptor_buffer() has finished modifying
950-
* the buffer's contents they really should run flush_dcache_page(bh->b_page).
950+
* the buffer's contents they really should run flush_dcache_folio(bh->b_folio).
951951
* But we don't bother doing that, so there will be coherency problems with
952952
* mmaps of blockdevs which hold live JBD-controlled filesystems.
953953
*/

0 commit comments

Comments
 (0)