On Tue 10-03-26 09:40:56, Zhang Yi wrote:
> From: Zhang Yi <yi.zhang@huawei.com>
>
> Rename ext4_block_zero_page_range() to ext4_block_zero_range() since the
> "page" naming is no longer appropriate for current context. Also change
> its signature to take an inode pointer instead of an address_space. This
> aligns with the caller ext4_block_zero_eof() and
> ext4_zero_partial_blocks().
>
> 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 | 24 ++++++++++--------------
> 1 file changed, 10 insertions(+), 14 deletions(-)
>
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index d63d455831b9..86f169df226a 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -4147,11 +4147,9 @@ static int ext4_block_journalled_zero_range(handle_t *handle,
> * the end of the block it will be shortened to end of the block
> * that corresponds to 'from'
> */
> -static int ext4_block_zero_page_range(handle_t *handle,
> - struct address_space *mapping, loff_t from, loff_t length,
> - bool *did_zero)
> +static int ext4_block_zero_range(handle_t *handle, struct inode *inode,
> + loff_t from, loff_t length, bool *did_zero)
> {
> - struct inode *inode = mapping->host;
> unsigned blocksize = inode->i_sb->s_blocksize;
> unsigned int max = blocksize - (from & (blocksize - 1));
>
> @@ -4198,8 +4196,7 @@ int ext4_block_zero_eof(handle_t *handle, struct inode *inode,
> if (length > blocksize - offset)
> length = blocksize - offset;
>
> - err = ext4_block_zero_page_range(handle, inode->i_mapping, from, length,
> - &did_zero);
> + err = ext4_block_zero_range(handle, inode, from, length, &did_zero);
> if (err)
> return err;
>
> @@ -4210,7 +4207,6 @@ int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode,
> loff_t lstart, loff_t length)
> {
> struct super_block *sb = inode->i_sb;
> - struct address_space *mapping = inode->i_mapping;
> unsigned partial_start, partial_end;
> ext4_fsblk_t start, end;
> loff_t byte_end = (lstart + length - 1);
> @@ -4225,22 +4221,22 @@ 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_page_range(handle, mapping,
> - lstart, length, NULL);
> + err = ext4_block_zero_range(handle, inode, lstart,
> + length, NULL);
> return err;
> }
> /* Handle partial zero out on the start of the range */
> if (partial_start) {
> - err = ext4_block_zero_page_range(handle, mapping, lstart,
> - sb->s_blocksize, NULL);
> + err = ext4_block_zero_range(handle, inode, lstart,
> + sb->s_blocksize, 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_page_range(handle, mapping,
> - byte_end - partial_end,
> - partial_end + 1, NULL);
> + err = ext4_block_zero_range(handle, inode,
> + byte_end - partial_end,
> + partial_end + 1, NULL);
> return err;
> }
>
> --
> 2.52.0
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR