From: Wang Shilong <wshilong@ddn.com>
Date: Mon, 24 Feb 2020 05:08:58 +0000 (+0800)
Subject: LU-8465 e2fsck: merge context flags properly
X-Git-Tag: v1.45.6.wc2~34
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0f87b70e33d21ca72ac554ab2cb4a0f4df9e3231;p=tools%2Fe2fsprogs.git

LU-8465 e2fsck: merge context flags properly

e2fsck might restart after pass1, so we should keep
flags if possible, this patch try to fix f_illitable_flexbg failure

Change-Id: I11229f2ad6225f53fed3a646058526bf5c853985
Signed-off-by: Wang Shilong <wshilong@ddn.com>
Reviewed-on: https://review.whamcloud.com/37783
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 80d8f60..b679c42 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -2827,9 +2827,7 @@ static int e2fsck_pass1_thread_join_one(e2fsck_t global_ctx, e2fsck_t thread_ctx
 	global_ctx->fs_fragmented_dir += fs_fragmented_dir;
 	global_ctx->large_files += large_files;
 
-	/* Keep the global singal flags*/
-	global_ctx->flags |= (flags & E2F_FLAG_SIGNAL_MASK) |
-			     (global_ctx->flags & E2F_FLAG_SIGNAL_MASK);
+	global_ctx->flags |= flags;
 
 	retval = e2fsck_pass1_merge_fs(global_fs, thread_fs);
 	if (retval) {