Message ID | 20131001012909.28415.3283.stgit@birch.djwong.org |
---|---|
State | Superseded, archived |
Headers | show |
On Mon, 30 Sep 2013, Darrick J. Wong wrote: > Date: Mon, 30 Sep 2013 18:29:09 -0700 > From: Darrick J. Wong <darrick.wong@oracle.com> > To: tytso@mit.edu, darrick.wong@oracle.com > Cc: linux-ext4@vger.kernel.org > Subject: [PATCH 23/31] libext2fs: expanddir and mkjournal need not update the > summary counts when performing an implied cluster allocation > > 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. Looks good. Reviewed-by: Lukas Czerner <lczerner@redhat.com> > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > --- > 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 c636a97..dd3c35b 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@vger.kernel.org > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 c636a97..dd3c35b 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);
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@oracle.com> --- lib/ext2fs/expanddir.c | 2 +- lib/ext2fs/mkjournal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html