From 949c894a417e01cd335a7ee13ce24b9d328b0856 Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Mon, 24 Feb 2020 13:08:58 +0800 Subject: [PATCH] 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 E2fsprogs-commit: c36fa1b28bd4171f53ab4f89a90f6b3b8bf80fd2 Change-Id: I6dda1520a2ff6255d244461af75d7609f47ba92b Signed-off-by: Wang Shilong Reviewed-by: Andreas Dilger Signed-off-by: Saranya Muruganandam Signed-off-by: Theodore Ts'o --- e2fsck/pass1.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 8fec4c4..616b421 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -2609,9 +2609,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) { -- 1.8.3.1