| Message ID | 20240102123918.799062-5-yi.zhang@huaweicloud.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | ext4: use iomap for regular file's buffered IO path and enable large foilo | expand |
On Tue 02-01-24 20:38:57, Zhang Yi wrote: > From: Zhang Yi <yi.zhang@huawei.com> > > In order to cache hole extents in the extent status tree and keep the > hole length as long as possible, re-add a hole entry to the cache just > after punching a hole. > > Signed-off-by: Zhang Yi <yi.zhang@huawei.com> Looks good. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/ext4/inode.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index 142c67f5c7fc..1b5e6409f958 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -4000,12 +4000,12 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) > > /* If there are blocks to remove, do it */ > if (stop_block > first_block) { > + ext4_lblk_t hole_len = stop_block - first_block; > > down_write(&EXT4_I(inode)->i_data_sem); > ext4_discard_preallocations(inode, 0); > > - ext4_es_remove_extent(inode, first_block, > - stop_block - first_block); > + ext4_es_remove_extent(inode, first_block, hole_len); > > if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) > ret = ext4_ext_remove_space(inode, first_block, > @@ -4014,6 +4014,8 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) > ret = ext4_ind_remove_space(handle, inode, first_block, > stop_block); > > + ext4_es_insert_extent(inode, first_block, hole_len, ~0, > + EXTENT_STATUS_HOLE); > up_write(&EXT4_I(inode)->i_data_sem); > } > ext4_fc_track_range(handle, inode, first_block, stop_block); > -- > 2.39.2 >
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 142c67f5c7fc..1b5e6409f958 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4000,12 +4000,12 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) /* If there are blocks to remove, do it */ if (stop_block > first_block) { + ext4_lblk_t hole_len = stop_block - first_block; down_write(&EXT4_I(inode)->i_data_sem); ext4_discard_preallocations(inode, 0); - ext4_es_remove_extent(inode, first_block, - stop_block - first_block); + ext4_es_remove_extent(inode, first_block, hole_len); if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) ret = ext4_ext_remove_space(inode, first_block, @@ -4014,6 +4014,8 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) ret = ext4_ind_remove_space(handle, inode, first_block, stop_block); + ext4_es_insert_extent(inode, first_block, hole_len, ~0, + EXTENT_STATUS_HOLE); up_write(&EXT4_I(inode)->i_data_sem); } ext4_fc_track_range(handle, inode, first_block, stop_block);