On Thu, Oct 17, 2013 at 09:50:14PM -0700, Darrick J. Wong wrote:
> When we're appending a block to a directory file or the journal file,
> and the new block is part of a cluster that has already been allocated
> to the file (implied cluster allocation), don't update the bitmap or
> the summary counts because that was performed when the cluster was
> allocated.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
In e2fsck/pass3.c we also have a expand_dir_proc() function to expand
dir. Maybe it also needs to be fixed. Otherwise the patch looks good
to me.
Reviewed-by: Zheng Liu <wenqing.lz@xxxxxxxxxx>
- Zheng
> ---
> lib/ext2fs/expanddir.c | 2 +-
> lib/ext2fs/mkjournal.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>
> diff --git a/lib/ext2fs/expanddir.c b/lib/ext2fs/expanddir.c
> index 22558d6..09a15fa 100644
> --- a/lib/ext2fs/expanddir.c
> +++ b/lib/ext2fs/expanddir.c
> @@ -55,6 +55,7 @@ static int expand_dir_proc(ext2_filsys fs,
> return BLOCK_ABORT;
> }
> es->newblocks++;
> + ext2fs_block_alloc_stats2(fs, new_blk, +1);
> }
> if (blockcnt > 0) {
> retval = ext2fs_new_dir_block(fs, 0, 0, &block);
> @@ -82,7 +83,6 @@ static int expand_dir_proc(ext2_filsys fs,
> }
> ext2fs_free_mem(&block);
> *blocknr = new_blk;
> - ext2fs_block_alloc_stats2(fs, new_blk, +1);
>
> if (es->done)
> return (BLOCK_CHANGED | BLOCK_ABORT);
> diff --git a/lib/ext2fs/mkjournal.c b/lib/ext2fs/mkjournal.c
> index 2afd3b7..8bf4670 100644
> --- a/lib/ext2fs/mkjournal.c
> +++ b/lib/ext2fs/mkjournal.c
> @@ -250,6 +250,7 @@ static int mkjournal_proc(ext2_filsys fs,
> es->err = retval;
> return BLOCK_ABORT;
> }
> + ext2fs_block_alloc_stats2(fs, new_blk, +1);
> es->newblocks++;
> }
> if (blockcnt >= 0)
> @@ -285,7 +286,6 @@ static int mkjournal_proc(ext2_filsys fs,
> return BLOCK_ABORT;
> }
> *blocknr = es->goal = new_blk;
> - ext2fs_block_alloc_stats2(fs, new_blk, +1);
>
> if (es->num_blocks == 0)
> return (BLOCK_CHANGED | BLOCK_ABORT);
>
> --
> 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
--
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
