diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-12-19 19:45:06 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-12-20 12:39:00 -0500 |
| commit | 71ba13755337e19c9a826dfc874562a36e1b24d3 (patch) | |
| tree | 11fa3dc4b9c818010347cf356ef4c31e721396d4 | |
| parent | 8dd73c149f418238f19791f9d666089ef9734dff (diff) | |
| download | e2fsprogs-71ba13755337e19c9a826dfc874562a36e1b24d3.tar.gz | |
e2fsck: don't try to rehash a deleted directory
If directory has been deleted in pass1[bcd] processing, then we
shouldn't try to rehash the directory in pass 3a when we try to
rehash/reoptimize directories.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | e2fsck/pass1b.c | 4 | ||||
| -rw-r--r-- | e2fsck/rehash.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c index 5693b9cfc..bca701cab 100644 --- a/e2fsck/pass1b.c +++ b/e2fsck/pass1b.c @@ -705,6 +705,10 @@ static void delete_file(e2fsck_t ctx, ext2_ino_t ino, fix_problem(ctx, PR_1B_BLOCK_ITERATE, &pctx); if (ctx->inode_bad_map) ext2fs_unmark_inode_bitmap2(ctx->inode_bad_map, ino); + if (ctx->inode_reg_map) + ext2fs_unmark_inode_bitmap2(ctx->inode_reg_map, ino); + ext2fs_unmark_inode_bitmap2(ctx->inode_dir_map, ino); + ext2fs_unmark_inode_bitmap2(ctx->inode_used_map, ino); ext2fs_inode_alloc_stats2(fs, ino, -1, LINUX_S_ISDIR(dp->inode.i_mode)); quota_data_sub(ctx->qctx, &dp->inode, ino, pb.dup_blocks * fs->blocksize); diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c index 3dd1e9413..2c908be04 100644 --- a/e2fsck/rehash.c +++ b/e2fsck/rehash.c @@ -1028,6 +1028,8 @@ void e2fsck_rehash_directories(e2fsck_t ctx) if (!ext2fs_u32_list_iterate(iter, &ino)) break; } + if (!ext2fs_test_inode_bitmap2(ctx->inode_dir_map, ino)) + continue; pctx.dir = ino; if (first) { |