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. Signed-off-by: Wang Shilong <wshilong@xxxxxxx> --- e2fsck/pass1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 7d6e531a..b4adb8fa 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -3010,6 +3010,8 @@ static errcode_t e2fsck_pass1_merge_context(e2fsck_t global_ctx, global_ctx->fs_fragmented_dir += thread_ctx->fs_fragmented_dir; global_ctx->large_files += thread_ctx->large_files; global_ctx->flags |= thread_ctx->flags; + /* threads might enable E2F_OPT_YES */ + global_ctx->options |= thread_ctx->options; e2fsck_pass1_merge_dir_info(global_ctx, thread_ctx); e2fsck_pass1_merge_dx_dir(global_ctx, thread_ctx); retval = e2fsck_pass1_merge_fs(global_ctx->fs, thread_ctx->fs); -- 2.25.4
