On Thu, Jun 30, 2011 at 4:03 PM, Robin Dong <hao.bigrat@xxxxxxxxx> wrote:
> If newext->ee_block is smaller than (or equal to) fex->ee_block, the call of
> ext4_ext_next_leaf_block will be useless. We need to call it only after
> newext->ee_block is greater than fex->ee_block.
>
> Signed-off-by: Robin Dong <sanbai@xxxxxxxxxx>
> ---
> fs/ext4/extents.c | 37 ++++++++++++++++++++-----------------
> 1 files changed, 20 insertions(+), 17 deletions(-)
>
> diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
> index dc5ef91..0ee475a 100644
> --- a/fs/ext4/extents.c
> +++ b/fs/ext4/extents.c
> @@ -1765,24 +1765,27 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode,
>
> /* probably next leaf has space for us? */
> fex = EXT_LAST_EXTENT(eh);
> - next = ext4_ext_next_leaf_block(inode, path);
> - if (le32_to_cpu(newext->ee_block) > le32_to_cpu(fex->ee_block)
> - && next != EXT_MAX_BLOCKS) {
How about:
next = EXT_MAX_BLOCKS;
if (le32_to_cpu(newext->ee_block) > le32_to_cpu(fex->ee_block)
next = ext4_ext_next_leaf_block(inode, path);
if (next != EXT_MAX_BLOCKS) {
Code above can reduce an indent.
Yongqiang.
> - ext_debug("next leaf block - %d\n", next);
> - BUG_ON(npath != NULL);
> - npath = ext4_ext_find_extent(inode, next, NULL);
> - if (IS_ERR(npath))
> - return PTR_ERR(npath);
> - BUG_ON(npath->p_depth != path->p_depth);
> - eh = npath[depth].p_hdr;
> - if (le16_to_cpu(eh->eh_entries) < le16_to_cpu(eh->eh_max)) {
> - ext_debug("next leaf isn't full(%d)\n",
> - le16_to_cpu(eh->eh_entries));
> - path = npath;
> - goto has_space;
> + if (le32_to_cpu(newext->ee_block) > le32_to_cpu(fex->ee_block)) {
> + next = ext4_ext_next_leaf_block(inode, path);
> + if (next != EXT_MAX_BLOCKS) {
> + ext_debug("next leaf block - %d\n", next);
> + BUG_ON(npath != NULL);
> + npath = ext4_ext_find_extent(inode, next, NULL);
> + if (IS_ERR(npath))
> + return PTR_ERR(npath);
> + BUG_ON(npath->p_depth != path->p_depth);
> + eh = npath[depth].p_hdr;
> + if (le16_to_cpu(eh->eh_entries) <
> + le16_to_cpu(eh->eh_max)) {
> + ext_debug("next leaf isn't full(%d)\n",
> + le16_to_cpu(eh->eh_entries));
> + path = npath;
> + goto has_space;
> + }
> + ext_debug("next leaf has no free space(%d,%d)\n",
> + le16_to_cpu(eh->eh_entries),
> + le16_to_cpu(eh->eh_max));
> }
> - ext_debug("next leaf has no free space(%d,%d)\n",
> - le16_to_cpu(eh->eh_entries), le16_to_cpu(eh->eh_max));
> }
>
> /*
> --
> 1.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Best Wishes
Yongqiang Yang
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
