From patchwork Thu Nov 17 02:03:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [6/6] ext4: move code checking if leaf is full to the beginning of ext4_ext_split Date: Wed, 16 Nov 2011 16:03:25 -0000 From: Yongqiang Yang X-Patchwork-Id: 126112 Message-Id: <1321495405-9583-6-git-send-email-xiaoqiangnk@gmail.com> To: tytso@mit.edu Cc: linux-ext4@vger.kernel.org, Yongqiang Yang The work checking if the lead is full can be done before we do actual splitting work. Signed-off-by: Yongqiang Yang --- fs/ext4/extents.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index d483635..6f0300e 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -817,6 +817,15 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode, EXT4_ERROR_INODE(inode, "p_ext > EXT_MAX_EXTENT!"); return -EIO; } + + if (unlikely(path[depth].p_hdr->eh_entries != + path[depth].p_hdr->eh_max)) { + EXT4_ERROR_INODE(inode, "eh_entries %d != eh_max %d!", + path[depth].p_hdr->eh_entries, + path[depth].p_hdr->eh_max); + return -EIO; + } + if (path[depth].p_ext != EXT_MAX_EXTENT(path[depth].p_hdr)) { border = path[depth].p_ext[1].ee_block; ext_debug("leaf will be split." @@ -875,14 +884,6 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode, neh->eh_depth = 0; /* move remainder of path[depth] to the new leaf */ - if (unlikely(path[depth].p_hdr->eh_entries != - path[depth].p_hdr->eh_max)) { - EXT4_ERROR_INODE(inode, "eh_entries %d != eh_max %d!", - path[depth].p_hdr->eh_entries, - path[depth].p_hdr->eh_max); - err = -EIO; - goto cleanup; - } /* start copy from next extent */ m = EXT_MAX_EXTENT(path[depth].p_hdr) - path[depth].p_ext++; ext4_ext_show_move(inode, path, newblock, depth);