On Wed, Nov 18, 2020 at 07:39:23AM -0800, Saranya Muruganandam wrote: > From: Wang Shilong <wshilong@xxxxxxx> > > It will be possible that threads might append E2F_OPT_YES, > so we need merge options to global, test f_yesall cover this. I don't get it -- presumably fix_problem already has to take some sort of a lock to complain the console and (possibly) wait for input, right? Why not just set E2F_OPT_YES right then and there and have it take effect across all threads immediately? I guess you'd have to add another lock to protect the options bitflags. --D > Signed-off-by: Wang Shilong <wshilong@xxxxxxx> > Signed-off-by: Saranya Muruganandam <saranyamohan@xxxxxxxxxx> > --- > e2fsck/pass1.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c > index ad3bd8be..1a68a2fb 100644 > --- a/e2fsck/pass1.c > +++ b/e2fsck/pass1.c > @@ -2935,6 +2935,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; > @@ -2987,7 +2988,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); > @@ -3022,10 +3024,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, > -- > 2.29.2.299.gdc1121823c-goog >
