github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 18:13:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ext4: remove handle parameters from zero partial block functions

Browse Source 
Only journal data mode requires an active journal handle when zeroing
partial blocks. Stop passing handle_t *handle to
ext4_zero_partial_blocks() and related functions, and make
ext4_block_journalled_zero_range() start a handle independently.

This change has no practical impact now because all callers invoke these
functions within the context of an active handle. It prepares for moving
ext4_block_zero_eof() out of an active handle in the next patch, which
is a prerequisite for converting block zero range operations to iomap
infrastructure.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20260327102939.1095257-7-yi.zhang@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Zhang Yi 2026-03-27 18:29:32 +08:00 committed by Theodore Ts'o
parent 69e2d5c1f5
commit d3609a71b7
3 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/ext4/ext4.h
View File

@ -3097,10 +3097,9 @@ extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks);
extern int ext4_chunk_trans_extent(struct inode *inode, int nrblocks);
extern int ext4_meta_trans_blocks(struct inode *inode, int lblocks,
int pextents);
extern int ext4_block_zero_eof(handle_t *handle, struct inode *inode,
loff_t from, loff_t end);
extern int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode,
loff_t lstart, loff_t lend);
extern int ext4_block_zero_eof(struct inode *inode, loff_t from, loff_t end);
extern int ext4_zero_partial_blocks(struct inode *inode, loff_t lstart,
loff_t length);
extern vm_fault_t ext4_page_mkwrite(struct vm_fault *vmf);
extern qsize_t *ext4_get_reserved_space(struct inode *inode);
extern int ext4_get_projid(struct inode *inode, kprojid_t *projid);

5
fs/ext4/extents.c
View File

@ -4654,8 +4654,7 @@ static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,
inode_get_ctime(inode));
if (epos > old_size) {
pagecache_isize_extended(inode, old_size, epos);
ext4_block_zero_eof(handle, inode, old_size,
epos);
ext4_block_zero_eof(inode, old_size, epos);
}
}
ret2 = ext4_mark_inode_dirty(handle, inode);
@ -4773,7 +4772,7 @@ static long ext4_zero_range(struct file *file, loff_t offset,
}
/* Zero out partial block at the edges of the range */
ret = ext4_zero_partial_blocks(handle, inode, offset, len);
ret = ext4_zero_partial_blocks(inode, offset, len);
if (ret)
goto out_handle;

71
fs/ext4/inode.c
View File

@ -1468,7 +1468,7 @@ static int ext4_write_end(const struct kiocb *iocb,
if (old_size < pos && !verity) {
pagecache_isize_extended(inode, old_size, pos);
ext4_block_zero_eof(handle, inode, old_size, pos);
ext4_block_zero_eof(inode, old_size, pos);
}
/*
* Don't mark the inode dirty under folio lock. First, it unnecessarily
@ -1586,7 +1586,7 @@ static int ext4_journalled_write_end(const struct kiocb *iocb,
if (old_size < pos && !verity) {
pagecache_isize_extended(inode, old_size, pos);
ext4_block_zero_eof(handle, inode, old_size, pos);
ext4_block_zero_eof(inode, old_size, pos);
}
if (size_changed) {
@ -3282,7 +3282,7 @@ static int ext4_da_do_write_end(struct address_space *mapping,
if (IS_ERR(handle))
return PTR_ERR(handle);
if (zero_len)
ext4_block_zero_eof(handle, inode, old_size, pos);
ext4_block_zero_eof(inode, old_size, pos);
ext4_mark_inode_dirty(handle, inode);
ext4_journal_stop(handle);
@ -4131,16 +4131,23 @@ static int ext4_block_do_zero_range(struct inode *inode, loff_t from,
return 0;
}
static int ext4_block_journalled_zero_range(handle_t *handle,
struct inode *inode, loff_t from, loff_t length, bool *did_zero)
static int ext4_block_journalled_zero_range(struct inode *inode, loff_t from,
loff_t length, bool *did_zero)
{
struct buffer_head *bh;
struct folio *folio;
handle_t *handle;
int err;
handle = ext4_journal_start(inode, EXT4_HT_MISC, 1);
if (IS_ERR(handle))
return PTR_ERR(handle);
bh = ext4_load_tail_bh(inode, from);
if (IS_ERR_OR_NULL(bh))
return PTR_ERR_OR_ZERO(bh);
if (IS_ERR_OR_NULL(bh)) {
err = PTR_ERR_OR_ZERO(bh);
goto out_handle;
}
folio = bh->b_folio;
BUFFER_TRACE(bh, "get write access");
@ -4161,6 +4168,8 @@ static int ext4_block_journalled_zero_range(handle_t *handle,
out:
folio_unlock(folio);
folio_put(folio);
out_handle:
ext4_journal_stop(handle);
return err;
}
@ -4170,7 +4179,7 @@ static int ext4_block_journalled_zero_range(handle_t *handle,
* If the specified range exceeds the end of the block it will be
* shortened to end of the block that corresponds to 'from'.
*/
static int ext4_block_zero_range(handle_t *handle, struct inode *inode,
static int ext4_block_zero_range(struct inode *inode,
loff_t from, loff_t length, bool *did_zero,
bool *zero_written)
{
@ -4188,8 +4197,8 @@ static int ext4_block_zero_range(handle_t *handle, struct inode *inode,
return dax_zero_range(inode, from, length, did_zero,
&ext4_iomap_ops);
} else if (ext4_should_journal_data(inode)) {
return ext4_block_journalled_zero_range(handle, inode, from,
length, did_zero);
return ext4_block_journalled_zero_range(inode, from, length,
did_zero);
}
return ext4_block_do_zero_range(inode, from, length, did_zero,
zero_written);
@ -4202,8 +4211,7 @@ static int ext4_block_zero_range(handle_t *handle, struct inode *inode,
* to physically zero the tail end of that block so it doesn't yield old
* data if the file is grown.
*/
int ext4_block_zero_eof(handle_t *handle, struct inode *inode,
loff_t from, loff_t end)
int ext4_block_zero_eof(struct inode *inode, loff_t from, loff_t end)
{
unsigned int blocksize = i_blocksize(inode);
unsigned int offset;
@ -4222,7 +4230,7 @@ int ext4_block_zero_eof(handle_t *handle, struct inode *inode,
if (length > blocksize - offset)
length = blocksize - offset;
err = ext4_block_zero_range(handle, inode, from, length,
err = ext4_block_zero_range(inode, from, length,
&did_zero, &zero_written);
if (err)
return err;
@ -4233,14 +4241,23 @@ int ext4_block_zero_eof(handle_t *handle, struct inode *inode,
* mmap write during folio writeback.
*/
if (ext4_should_order_data(inode) &&
did_zero && zero_written && !IS_DAX(inode))
err = ext4_jbd2_inode_add_write(handle, inode, from, length);
did_zero && zero_written && !IS_DAX(inode)) {
handle_t *handle;
return err;
handle = ext4_journal_start(inode, EXT4_HT_MISC, 1);
if (IS_ERR(handle))
return PTR_ERR(handle);
err = ext4_jbd2_inode_add_write(handle, inode, from, length);
ext4_journal_stop(handle);
if (err)
return err;
}
return 0;
}
int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode,
loff_t lstart, loff_t length)
int ext4_zero_partial_blocks(struct inode *inode, loff_t lstart, loff_t length)
{
struct super_block *sb = inode->i_sb;
unsigned partial_start, partial_end;
@ -4257,21 +4274,19 @@ int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode,
/* Handle partial zero within the single block */
if (start == end &&
(partial_start || (partial_end != sb->s_blocksize - 1))) {
err = ext4_block_zero_range(handle, inode, lstart,
length, NULL, NULL);
err = ext4_block_zero_range(inode, lstart, length, NULL, NULL);
return err;
}
/* Handle partial zero out on the start of the range */
if (partial_start) {
err = ext4_block_zero_range(handle, inode, lstart,
sb->s_blocksize, NULL, NULL);
err = ext4_block_zero_range(inode, lstart, sb->s_blocksize,
NULL, NULL);
if (err)
return err;
}
/* Handle partial zero out on the end of the range */
if (partial_end != sb->s_blocksize - 1)
err = ext4_block_zero_range(handle, inode,
byte_end - partial_end,
err = ext4_block_zero_range(inode, byte_end - partial_end,
partial_end + 1, NULL, NULL);
return err;
}
@ -4467,7 +4482,7 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length)
return ret;
}
ret = ext4_zero_partial_blocks(handle, inode, offset, length);
ret = ext4_zero_partial_blocks(inode, offset, length);
if (ret)
goto out_handle;
@ -4622,7 +4637,7 @@ int ext4_truncate(struct inode *inode)
/* Zero to the end of the block containing i_size */
if (inode->i_size & (inode->i_sb->s_blocksize - 1))
ext4_block_zero_eof(handle, inode, inode->i_size, LLONG_MAX);
ext4_block_zero_eof(inode, inode->i_size, LLONG_MAX);
/*
* We add the inode to the orphan list, so that if this
@ -6011,8 +6026,8 @@ int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
inode_set_mtime_to_ts(inode,
inode_set_ctime_current(inode));
if (oldsize & (inode->i_sb->s_blocksize - 1))
ext4_block_zero_eof(handle, inode,
oldsize, LLONG_MAX);
ext4_block_zero_eof(inode, oldsize,
LLONG_MAX);
}
if (shrink)