diff options
| author | Wang Shilong <wshilong@ddn.com> | 2020-02-24 13:08:58 +0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2021-01-25 15:17:45 -0500 |
| commit | c36fa1b28bd4171f53ab4f89a90f6b3b8bf80fd2 (patch) | |
| tree | a1c9ebce0223509b188cd7b70546645d2c86423c | |
| parent | e2db6c19943065909c11af3b03c2904c35e5e4f8 (diff) | |
| download | e2fsprogs-c36fa1b28bd4171f53ab4f89a90f6b3b8bf80fd2.tar.gz | |
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
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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 369d047b0..4e7520cbf 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -2573,9 +2573,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) { |