Skip to content

Commit 41189b4

Browse files
jankarabrauner
authored andcommitted
ext4: Track metadata bhs in fs-private inode part
Track metadata bhs for an inode in fs-private part of the inode. We need the tracking only for nojournal mode so this is somewhat wasteful. We can relatively easily make the mapping_metadata_bhs struct dynamically allocated similarly to how we treat jbd2_inode but let's leave that for ext4 specific series once the dust settles a bit. Signed-off-by: Jan Kara <jack@suse.cz> Link: https://patch.msgid.link/20260326095354.16340-82-jack@suse.cz Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent caaa184 commit 41189b4

5 files changed

Lines changed: 10 additions & 6 deletions

File tree

fs/ext4/ext4.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,6 +1121,7 @@ struct ext4_inode_info {
11211121
struct rw_semaphore i_data_sem;
11221122
struct inode vfs_inode;
11231123
struct jbd2_inode *jinode;
1124+
struct mapping_metadata_bhs i_metadata_bhs;
11241125

11251126
/*
11261127
* File creation time. Its function is same as that of

fs/ext4/ext4_jbd2.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,8 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line,
390390
}
391391
} else {
392392
if (inode)
393-
mark_buffer_dirty_inode(bh, inode);
393+
mmb_mark_buffer_dirty(bh,
394+
&EXT4_I(inode)->i_metadata_bhs);
394395
else
395396
mark_buffer_dirty(bh);
396397
if (inode && inode_needs_sync(inode)) {

fs/ext4/fsync.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static int ext4_sync_parent(struct inode *inode)
6868
* through ext4_evict_inode()) and so we are safe to flush
6969
* metadata blocks and the inode.
7070
*/
71-
ret = sync_mapping_buffers(inode->i_mapping);
71+
ret = mmb_sync(&EXT4_I(inode)->i_metadata_bhs);
7272
if (ret)
7373
break;
7474
ret = sync_inode_metadata(inode, 1);
@@ -85,7 +85,8 @@ static int ext4_fsync_nojournal(struct file *file, loff_t start, loff_t end,
8585
struct inode *inode = file->f_inode;
8686
int ret;
8787

88-
ret = generic_buffers_fsync_noflush(file, start, end, datasync);
88+
ret = mmb_fsync_noflush(file, &EXT4_I(inode)->i_metadata_bhs,
89+
start, end, datasync);
8990
if (!ret)
9091
ret = ext4_sync_parent(inode);
9192
if (test_opt(inode->i_sb, BARRIER))

fs/ext4/inode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ void ext4_evict_inode(struct inode *inode)
187187
truncate_inode_pages_final(&inode->i_data);
188188
/* Avoid mballoc special inode which has no proper iops */
189189
if (!EXT4_SB(inode->i_sb)->s_journal)
190-
sync_mapping_buffers(&inode->i_data);
190+
mmb_sync(&EXT4_I(inode)->i_metadata_bhs);
191191
goto no_delete;
192192
}
193193

@@ -3436,7 +3436,7 @@ static bool ext4_inode_datasync_dirty(struct inode *inode)
34363436
}
34373437

34383438
/* Any metadata buffers to write? */
3439-
if (mmb_has_buffers(&inode->i_mapping->i_metadata_bhs))
3439+
if (mmb_has_buffers(&EXT4_I(inode)->i_metadata_bhs))
34403440
return true;
34413441
return inode_state_read_once(inode) & I_DIRTY_DATASYNC;
34423442
}

fs/ext4/super.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1428,6 +1428,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)
14281428
INIT_WORK(&ei->i_rsv_conversion_work, ext4_end_io_rsv_work);
14291429
ext4_fc_init_inode(&ei->vfs_inode);
14301430
spin_lock_init(&ei->i_fc_lock);
1431+
mmb_init(&ei->i_metadata_bhs, &ei->vfs_inode.i_data);
14311432
return &ei->vfs_inode;
14321433
}
14331434

@@ -1525,7 +1526,7 @@ void ext4_clear_inode(struct inode *inode)
15251526
{
15261527
ext4_fc_del(inode);
15271528
if (!EXT4_SB(inode->i_sb)->s_journal)
1528-
invalidate_inode_buffers(inode);
1529+
mmb_invalidate(&EXT4_I(inode)->i_metadata_bhs);
15291530
clear_inode(inode);
15301531
ext4_discard_preallocations(inode);
15311532
ext4_es_remove_extent(inode, 0, EXT_MAX_BLOCKS);

0 commit comments

Comments
 (0)