From: "Darrick J. Wong" Subject: [PATCH 22/34] libext2fs: find inode goal when allocating blocks Date: Sat, 13 Sep 2014 15:13:38 -0700 Message-ID: <20140913221338.13646.66659.stgit@birch.djwong.org> References: <20140913221112.13646.3873.stgit@birch.djwong.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: linux-ext4@vger.kernel.org To: tytso@mit.edu, darrick.wong@oracle.com Return-path: Received: from aserp1040.oracle.com ([141.146.126.69]:24514 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752350AbaIMWNm (ORCPT ); Sat, 13 Sep 2014 18:13:42 -0400 In-Reply-To: <20140913221112.13646.3873.stgit@birch.djwong.org> Sender: linux-ext4-owner@vger.kernel.org List-ID: Try to be a little smarter about where we go to allocate blocks for a inode. Signed-off-by: Darrick J. Wong --- e2fsck/pass2.c | 3 ++- lib/ext2fs/alloc.c | 10 ++++++++++ lib/ext2fs/bmap.c | 5 +++-- lib/ext2fs/expanddir.c | 2 +- lib/ext2fs/ext2fs.h | 1 + lib/ext2fs/ext_attr.c | 4 +--- lib/ext2fs/extent.c | 10 ++-------- lib/ext2fs/mkdir.c | 3 ++- lib/ext2fs/symlink.c | 3 ++- 9 files changed, 24 insertions(+), 17 deletions(-) diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c index 2060ed2..fa17f20 100644 --- a/e2fsck/pass2.c +++ b/e2fsck/pass2.c @@ -1807,7 +1807,8 @@ static int allocate_dir_block(e2fsck_t ctx, pctx->errcode = ext2fs_map_cluster_block(fs, db->ino, &inode, db->blockcnt, &blk); if (pctx->errcode || blk == 0) { - pctx->errcode = ext2fs_new_block2(fs, 0, + blk = ext2fs_find_inode_goal(fs, db->ino); + pctx->errcode = ext2fs_new_block2(fs, blk, ctx->block_found_map, &blk); if (pctx->errcode) { pctx->str = "ext2fs_new_block"; diff --git a/lib/ext2fs/alloc.c b/lib/ext2fs/alloc.c index 4e3bfdb..e58c01b 100644 --- a/lib/ext2fs/alloc.c +++ b/lib/ext2fs/alloc.c @@ -303,3 +303,13 @@ void ext2fs_set_alloc_block_callback(ext2_filsys fs, fs->get_alloc_block = func; } + +blk64_t ext2fs_find_inode_goal(ext2_filsys fs, ext2_ino_t ino) +{ + dgrp_t group = ext2fs_group_of_ino(fs, ino); + __u8 log_flex = fs->super->s_log_groups_per_flex; + + if (log_flex) + group = group & ~((1 << (log_flex)) - 1); + return ext2fs_group_first_block2(fs, group); +} diff --git a/lib/ext2fs/bmap.c b/lib/ext2fs/bmap.c index a4dc8ef..7623052 100644 --- a/lib/ext2fs/bmap.c +++ b/lib/ext2fs/bmap.c @@ -252,7 +252,7 @@ got_block: retval = extent_bmap(fs, ino, inode, handle, block_buf, 0, block-1, 0, blocks_alloc, &blk64); if (retval) - blk64 = 0; + blk64 = ext2fs_find_inode_goal(fs, ino); retval = ext2fs_alloc_block2(fs, blk64, block_buf, &blk64); if (retval) @@ -368,7 +368,8 @@ errcode_t ext2fs_bmap2(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode, } *phys_blk = inode_bmap(inode, block); - b = block ? inode_bmap(inode, block-1) : 0; + b = block ? inode_bmap(inode, block-1) : + ext2fs_find_inode_goal(fs, ino); if ((*phys_blk == 0) && (bmap_flags & BMAP_ALLOC)) { retval = ext2fs_alloc_block(fs, b, block_buf, &b); diff --git a/lib/ext2fs/expanddir.c b/lib/ext2fs/expanddir.c index ecc13ae..e8dff30 100644 --- a/lib/ext2fs/expanddir.c +++ b/lib/ext2fs/expanddir.c @@ -104,7 +104,7 @@ errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir) es.done = 0; es.err = 0; - es.goal = 0; + es.goal = ext2fs_find_inode_goal(fs, dir); es.newblocks = 0; es.dir = dir; diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index 3419185..dcc3ec4 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -696,6 +696,7 @@ extern void ext2fs_set_alloc_block_callback(ext2_filsys fs, errcode_t (**old)(ext2_filsys fs, blk64_t goal, blk64_t *ret)); +blk64_t ext2fs_find_inode_goal(ext2_filsys fs, ext2_ino_t ino); /* alloc_sb.c */ extern int ext2fs_reserve_super_and_bgd(ext2_filsys fs, diff --git a/lib/ext2fs/ext_attr.c b/lib/ext2fs/ext_attr.c index b52abb5..633835b 100644 --- a/lib/ext2fs/ext_attr.c +++ b/lib/ext2fs/ext_attr.c @@ -374,7 +374,6 @@ static errcode_t prep_ea_block_for_write(ext2_filsys fs, ext2_ino_t ino, { struct ext2_ext_attr_header *header; void *block_buf = NULL; - dgrp_t grp; blk64_t blk, goal; errcode_t err; @@ -420,8 +419,7 @@ static errcode_t prep_ea_block_for_write(ext2_filsys fs, ext2_ino_t ino, } /* Allocate a block */ - grp = ext2fs_group_of_ino(fs, ino); - goal = ext2fs_inode_table_loc(fs, grp); + goal = ext2fs_find_inode_goal(fs, ino); err = ext2fs_alloc_block2(fs, goal, NULL, &blk); if (err) goto out2; diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c index c9ef701..4c6fbbf 100644 --- a/lib/ext2fs/extent.c +++ b/lib/ext2fs/extent.c @@ -1012,14 +1012,8 @@ static errcode_t extent_node_split(ext2_extent_handle_t handle, goto done; } - if (!goal_blk) { - dgrp_t group = ext2fs_group_of_ino(handle->fs, handle->ino); - __u8 log_flex = handle->fs->super->s_log_groups_per_flex; - - if (log_flex) - group = group & ~((1 << (log_flex)) - 1); - goal_blk = ext2fs_group_first_block2(handle->fs, group); - } + if (!goal_blk) + goal_blk = ext2fs_find_inode_goal(handle->fs, handle->ino); retval = ext2fs_alloc_block2(handle->fs, goal_blk, block_buf, &new_node_pblk); if (retval) diff --git a/lib/ext2fs/mkdir.c b/lib/ext2fs/mkdir.c index c4c7967..c88ff9e 100644 --- a/lib/ext2fs/mkdir.c +++ b/lib/ext2fs/mkdir.c @@ -69,7 +69,8 @@ errcode_t ext2fs_mkdir(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t inum, * Allocate a data block for the directory */ if (!inline_data) { - retval = ext2fs_new_block2(fs, 0, 0, &blk); + retval = ext2fs_new_block2(fs, ext2fs_find_inode_goal(fs, ino), + NULL, &blk); if (retval) goto cleanup; } diff --git a/lib/ext2fs/symlink.c b/lib/ext2fs/symlink.c index f6eb6b6..e268ed4 100644 --- a/lib/ext2fs/symlink.c +++ b/lib/ext2fs/symlink.c @@ -53,7 +53,8 @@ errcode_t ext2fs_symlink(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t ino, */ fastlink = (target_len < sizeof(inode.i_block)); if (!fastlink) { - retval = ext2fs_new_block2(fs, 0, 0, &blk); + retval = ext2fs_new_block2(fs, ext2fs_find_inode_goal(fs, ino), + NULL, &blk); if (retval) goto cleanup; retval = ext2fs_get_mem(fs->blocksize, &block_buf);