diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2017-04-15 00:29:46 -0400 |
|---|---|---|
| committer | Keun-young Park <keunyoung@google.com> | 2017-04-26 17:08:47 -0700 |
| commit | 16ffbacc8ae687d89366175752469372ffe3c142 (patch) | |
| tree | 41b12034906f28676908f0d3d1503ff77ebdf6ca | |
| parent | 34115ec38e86ba3cc17ae7a866e891abf7bd3aeb (diff) | |
| download | e2fsprogs-16ffbacc8ae687d89366175752469372ffe3c142.tar.gz | |
e2fsck: update quota when optimizing the extent treeandroid-wear-o-preview-3android-vts-8.0_r2android-vts-8.0_r1oreo-dev
If quota is enabled, optimizing the extent tree wouldn't update the
in-memory quota statistics, so that a subsequent e2fsck run would show
that the quota usage statistics on disk were incorrect.
Google-Bug-Id: 36391645
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
(cherry picked from commit 96c8e668f7c780dccbc12b7ecc4cac9a5db2bc97)
Change-Id: I429a0ac64b1cc9e5a288f61ba3942e391e575013
| -rw-r--r-- | e2fsck/extents.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/e2fsck/extents.c b/e2fsck/extents.c index c4167e16..7f28e6dd 100644 --- a/e2fsck/extents.c +++ b/e2fsck/extents.c @@ -208,17 +208,19 @@ static int find_blocks(ext2_filsys fs, blk64_t *blocknr, e2_blkcnt_t blockcnt, static errcode_t rebuild_extent_tree(e2fsck_t ctx, struct extent_list *list, ext2_ino_t ino) { - struct ext2_inode inode; + struct ext2_inode_large inode; errcode_t retval; ext2_extent_handle_t handle; unsigned int i, ext_written; struct ext2fs_extent *ex, extent; + blk64_t start_val, delta; list->count = 0; list->blocks_freed = 0; list->ino = ino; list->ext_read = 0; - e2fsck_read_inode(ctx, ino, &inode, "rebuild_extents"); + e2fsck_read_inode_full(ctx, ino, EXT2_INODE(&inode), sizeof(inode), + "rebuild_extents"); /* Skip deleted inodes and inline data files */ if (inode.i_links_count == 0 || @@ -248,16 +250,20 @@ extents_loaded: memset(inode.i_block, 0, sizeof(inode.i_block)); /* Make a note of freed blocks */ - retval = ext2fs_iblk_sub_blocks(ctx->fs, &inode, list->blocks_freed); + quota_data_sub(ctx->qctx, &inode, ino, + list->blocks_freed * ctx->fs->blocksize); + retval = ext2fs_iblk_sub_blocks(ctx->fs, EXT2_INODE(&inode), + list->blocks_freed); if (retval) goto err; /* Now stuff extents into the file */ - retval = ext2fs_extent_open2(ctx->fs, ino, &inode, &handle); + retval = ext2fs_extent_open2(ctx->fs, ino, EXT2_INODE(&inode), &handle); if (retval) goto err; ext_written = 0; + start_val = ext2fs_inode_i_blocks(ctx->fs, EXT2_INODE(&inode)); for (i = 0, ex = list->extents; i < list->count; i++, ex++) { memcpy(&extent, ex, sizeof(struct ext2fs_extent)); extent.e_flags &= EXT2_EXTENT_FLAGS_UNINIT; @@ -295,11 +301,21 @@ extents_loaded: ext_written++; } + delta = ext2fs_inode_i_blocks(ctx->fs, EXT2_INODE(&inode)) - start_val; + if (delta) { + if (!ext2fs_has_feature_huge_file(ctx->fs->super) || + !(inode.i_flags & EXT4_HUGE_FILE_FL)) + delta <<= 9; + else + delta *= ctx->fs->blocksize; + quota_data_add(ctx->qctx, &inode, ino, delta); + } + #if defined(DEBUG) || defined(DEBUG_SUMMARY) printf("rebuild: ino=%d extents=%d->%d\n", ino, list->ext_read, ext_written); #endif - e2fsck_write_inode(ctx, ino, &inode, "rebuild_extents"); + e2fsck_write_inode(ctx, ino, EXT2_INODE(&inode), "rebuild_extents"); err2: ext2fs_extent_free(handle); |