diff options
| author | Wang Shilong <wshilong@ddn.com> | 2020-03-19 22:05:30 +0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2021-01-25 15:18:20 -0500 |
| commit | a68a5e890793eda2e8d7b4f7d27d23a7eeb474c5 (patch) | |
| tree | a990800b7b5b86d744cfda8a61eece2c9c89c509 | |
| parent | 02618b8f69c1ed453b092476cbd0d735206c939d (diff) | |
| download | e2fsprogs-a68a5e890793eda2e8d7b4f7d27d23a7eeb474c5.tar.gz | |
e2fsck: merge options after threads finish
It will be possible that threads might append E2F_OPT_YES,
so we need merge options to global, test f_yesall cover this.
Signed-off-by: Wang Shilong <wshilong@ddn.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Signed-off-by: Saranya Muruganandam <saranyamohan@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | e2fsck/pass1.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 61b1e4f75..1ffa6e26b 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -2936,6 +2936,7 @@ static int e2fsck_pass1_thread_join_one(e2fsck_t global_ctx, e2fsck_t thread_ctx ext2_refcount_t ea_inode_refs = global_ctx->ea_inode_refs; ext2fs_block_bitmap block_found_map = global_ctx->block_found_map; ext2fs_block_bitmap block_dup_map = global_ctx->block_dup_map; + int options = global_ctx->options; #ifdef HAVE_SETJMP_H jmp_buf old_jmp; @@ -2988,7 +2989,8 @@ static int e2fsck_pass1_thread_join_one(e2fsck_t global_ctx, e2fsck_t thread_ctx global_ctx->fs_fragmented += fs_fragmented; global_ctx->fs_fragmented_dir += fs_fragmented_dir; global_ctx->large_files += large_files; - + /* threads might enable E2F_OPT_YES */ + global_ctx->options |= options; global_ctx->flags |= flags; retval = e2fsck_pass1_merge_fs(global_fs, thread_fs); @@ -3023,10 +3025,7 @@ static int e2fsck_pass1_thread_join_one(e2fsck_t global_ctx, e2fsck_t thread_ctx thread_ctx->qctx); if (retval) return retval; - global_ctx->invalid_block_bitmap_flag = invalid_block_bitmap_flag; - global_ctx->invalid_inode_bitmap_flag = invalid_inode_bitmap_flag; - global_ctx->invalid_inode_table_flag = invalid_inode_table_flag; - global_ctx->invalid_bitmaps = invalid_bitmaps; + e2fsck_pass1_merge_invalid_bitmaps(global_ctx, thread_ctx); retval = e2fsck_pass1_merge_bitmap(global_fs, |