Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1430536ybt; Thu, 18 Jun 2020 08:30:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCvMsaReXbK7+A3sv8kSWpLbf/1Jx9OEbHlIKnabXrLo4wgJvuKDRToBFDiiS3BbHyWybQ X-Received: by 2002:a17:906:509:: with SMTP id j9mr4302282eja.341.1592494237262; Thu, 18 Jun 2020 08:30:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592494237; cv=none; d=google.com; s=arc-20160816; b=0wIPSqTzTZS3ZXP3jI0pitXLLKQMUmNgV/lG8pX1++SeoddWTJfw5PB05BnkvY9+TF 2DSVfX2xueDelAVoGEipZauawdDmOXiqUEr73hpfxawQ7oIO6/TMuQ64of9DlfX+hH/l si6tQXpTWP66skAkrVvL6Uyzt2jcDhD3cw7sTyA3T5b5fxI2Ww5xO+lNXeQmvMSxIrg+ ZhMLTvOqcEs80sqFXRBr14d6F2gjPGO/lOtagsjh9f6ZpQKSNWk2UWSkxV4enByoeeB3 eYNkZFck+7LSifZjNMde2RdqIGsiMXwDI79vY8Qs4EEjRHnKnz0TcCCXtvSa158N30rt tJfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=RAkVjB5r/x0wGP4lXQ1ZMr5DaYhkXmdzrJRMrUQ8jik=; b=mZepiADQXRIBxo9heHTMxKmoZ8FFOglgx0EMk6p5slCjBNvwhdlEPqJCAlUWPp+rWn 5adZwElkjAgCTD5dnJnN3/YNQfhLV+rWP8e9AD5TDlA3O1mVdtUia/bFuWbh7p+2sN4E /tbKlJzkiWp+PiyNxSHtEeyKc/Hr/3xcP9v8ACRNV9Pi6mznALuMmOFG2bVqGFKzLZEL LFDFDNf95vWqQNlVM7pyTIO3/MsoCSWMRT6ioanBCqd7WYkeLzFMAx0zJTMCXsWalOVJ 9W/aJ9OkJN7i+eDUtreg8n7jurPOvHkM1o3EdPXE9iaGrZDP+ATUMuaJXZ8Kmccip0XB VD+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=vgwuyjbO; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id qh14si2059219ejb.259.2020.06.18.08.30.12; Thu, 18 Jun 2020 08:30:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=vgwuyjbO; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731510AbgFRP3c (ORCPT + 99 others); Thu, 18 Jun 2020 11:29:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731602AbgFRP32 (ORCPT ); Thu, 18 Jun 2020 11:29:28 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66135C06174E for ; Thu, 18 Jun 2020 08:29:27 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id d6so2827944pjs.3 for ; Thu, 18 Jun 2020 08:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RAkVjB5r/x0wGP4lXQ1ZMr5DaYhkXmdzrJRMrUQ8jik=; b=vgwuyjbOvZzllQbqerbVCkvbPQq2TcIWD3RcWjpoLZ6L3Va8BQURkOrq6hoxb1Vfoq 9ZlcPSMpyhk1nYIPqVzn3DFe3INCKjvCHAylIdC/64ZrLpS6engsuMvzsMiJRA72ho6u fKZqjkUvOCyIj5HMZM2sJNDnH6pfanGOHvjl3e/oKsI9fXlzHWdXh5rpeUMogkuLtGBf NWG4gUxs946UYUjwQjJHWvdVtH3zDRRXcxs7NSsDeT5z5nQdplFjJb8httr8FqtA45UY cbfLBWV4CXbHR4xo85lZphOxiNo3tjW9lPo5h6lWyi6iVxmzlrndLjRkfJpUuKQSbkSd Txmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RAkVjB5r/x0wGP4lXQ1ZMr5DaYhkXmdzrJRMrUQ8jik=; b=UVm5wC9Q4AcKt1KT7956p8XKYDmD+NHijGnopp8Su5AGiihgLl3sd1uqs16PTXLCR7 Rt4Z0s5CK9AIYgyV4lxdHQEpmnXWoyqQxzRjrehMP6q3h5vsYtIsTzrgMnotTyAJiq74 0lpIeXizYvxPogYHDiLxgo5lS+AAKQxgAQNlWx8bA5V/C69c0fWxMB3tPzlBTTXRJizj 4SXMTLGyiyavupWGCROSzIzpaaaCfwPupeflDtuGdinaJ5w9u+B6Ym978ZyJ5ZZCfXmC CyK0Dj5BgRKwHeMVauMnPYe7XepfASDlIzPdB6VCG8XBjrvn5Op6wjusS7YVuGMrU8Cz wtNg== X-Gm-Message-State: AOAM530Wx3aRJjfMaCmhTsAveEUeZA36xtQX0FNlqGNxUmaB0KiTzPRS 4ibLMksUl8QOtfydLczKwnRk7s/eObY= X-Received: by 2002:a17:90a:bf0b:: with SMTP id c11mr5018807pjs.47.1592494166586; Thu, 18 Jun 2020 08:29:26 -0700 (PDT) Received: from localhost.localdomain (ftp.datadirectnet.jp. [182.171.80.51]) by smtp.gmail.com with ESMTPSA id y81sm3306650pfb.33.2020.06.18.08.29.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jun 2020 08:29:25 -0700 (PDT) From: Wang Shilong To: linux-ext4@vger.kernel.org Cc: lixi@ddn.com, adilger@dilger.ca, wangshilong1991@gmail.com, sihara@ddn.com, Wang Shilong Subject: [RFC PATCH v2 31/51] e2fsck: merge context flags properly Date: Fri, 19 Jun 2020 00:27:34 +0900 Message-Id: <1592494074-28991-32-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1592494074-28991-1-git-send-email-wangshilong1991@gmail.com> References: <1592494074-28991-1-git-send-email-wangshilong1991@gmail.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Wang Shilong 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 --- e2fsck/pass1.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 3e608f3b..182e1cd8 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -2604,9 +2604,7 @@ static int e2fsck_pass1_thread_join_one(e2fsck_t global_ctx, e2fsck_t thread_ctx PASS1_MERGE_CTX_COUNT(global_ctx, thread_ctx, fs_fragmented_dir); PASS1_MERGE_CTX_COUNT(global_ctx, thread_ctx, 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) { -- 2.25.4