Re: [PATCH v2 25/25] ext4: save unnecessary indentation in ext4_ext_create_new_leaf()

Jan Kara
2024-08-27T17:16:23Z

On Thu 22-08-24 10:35:45, libaokun@huaweicloud.com wrote:
> From: Baokun Li <libaokun1@huawei.com>
>
> Save an indentation level in ext4_ext_create_new_leaf() by removing
> unnecessary 'else'. Besides, the variable 'ee_block' is declared to
> avoid line breaks. No functional changes.
>
> Suggested-by: Jan Kara <jack@suse.cz>
> Signed-off-by: Baokun Li <libaokun1@huawei.com>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <jack@suse.cz>

Honza

> ---
> fs/ext4/extents.c | 44 +++++++++++++++++++++-----------------------
> 1 file changed, 21 insertions(+), 23 deletions(-)
>
> diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
> index ca1f946514dd..45ddc0692673 100644
> --- a/fs/ext4/extents.c
> +++ b/fs/ext4/extents.c
> @@ -1403,6 +1403,7 @@ ext4_ext_create_new_leaf(handle_t *handle, struct inode *inode,
> {
> struct ext4_ext_path *curp;
> int depth, i, err = 0;
> + ext4_lblk_t ee_block = le32_to_cpu(newext->ee_block);
>
> repeat:
> i = depth = ext_depth(inode);
> @@ -1424,33 +1425,30 @@ ext4_ext_create_new_leaf(handle_t *handle, struct inode *inode,
> goto errout;
>
> /* refill path */
> - path = ext4_find_extent(inode,
> - (ext4_lblk_t)le32_to_cpu(newext->ee_block),
> - path, gb_flags);
> + path = ext4_find_extent(inode, ee_block, path, gb_flags);
> return path;
> - } else {
> - /* tree is full, time to grow in depth */
> - err = ext4_ext_grow_indepth(handle, inode, mb_flags);
> - if (err)
> - goto errout;
> + }
>
> - /* refill path */
> - path = ext4_find_extent(inode,
> - (ext4_lblk_t)le32_to_cpu(newext->ee_block),
> - path, gb_flags);
> - if (IS_ERR(path))
> - return path;
> + /* tree is full, time to grow in depth */
> + err = ext4_ext_grow_indepth(handle, inode, mb_flags);
> + if (err)
> + goto errout;
>
> - /*
> - * only first (depth 0 -> 1) produces free space;
> - * in all other cases we have to split the grown tree
> - */
> - depth = ext_depth(inode);
> - if (path[depth].p_hdr->eh_entries == path[depth].p_hdr->eh_max) {
> - /* now we need to split */
> - goto repeat;
> - }
> + /* refill path */
> + path = ext4_find_extent(inode, ee_block, path, gb_flags);
> + if (IS_ERR(path))
> + return path;
> +
> + /*
> + * only first (depth 0 -> 1) produces free space;
> + * in all other cases we have to split the grown tree
> + */
> + depth = ext_depth(inode);
> + if (path[depth].p_hdr->eh_entries == path[depth].p_hdr->eh_max) {
> + /* now we need to split */
> + goto repeat;
> }
> +
> return path;
>
> errout:
> --
> 2.39.2
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR