From patchwork Tue Feb 14 02:29:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Bin X-Patchwork-Id: 56607 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2707475wrn; Mon, 13 Feb 2023 18:14:44 -0800 (PST) X-Google-Smtp-Source: AK7set/THxBeU4m8Asron86Uxf8WjW9815u1bgmTHhVCRzyWnefhLe8SP1A60RMQDD7TC9FawQxE X-Received: by 2002:a17:902:f28b:b0:19a:75b8:f4ff with SMTP id k11-20020a170902f28b00b0019a75b8f4ffmr776242plc.35.1676340883869; Mon, 13 Feb 2023 18:14:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676340883; cv=none; d=google.com; s=arc-20160816; b=SsUGRzLaX3ybVAupOUOTBxjSraft5uXIEvm2YzmZsyn52KsDuUuYQB1pQFjJErTxIf kS39DIl52M0c7F0yRWeP/BAJMxRBO+IHh1aVhm4+zlrw9kr91iLsDgxx982vIr6LW70g fXoesAHdQ6DwcMbJePAfnoLH6Jjd1lknwGwPzpZBEGTWqyE770nZh8jmjFTbBMw5B7ln ZojVpXw7WYwm/swhU0FtPDzV181bQmlBZpLLUdXX4Qj8uqKEUuXGe1lF2GpILJfC+d/9 slNr+AXVlJgc3VSpYpYOVTy2PeQ7LAjj6hib0LIxAplwlxaL6FIZ/ELD21lMPndRbGr/ 8Mgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=6XgMpQZGGvHAlC1QfWb1MZXsOYsZxVG/TlV8JeiAb7g=; b=js+j/LehI2NO7xtS1xu34nQKvUhDwGzu23YC43/DqSC0MrfTbk1F/xljPVuYuePfRt D/R3g1dASfc2/3DD6CiQ2u6kmz9i694EqNcnjPUFQ/ZwnEaSkazIPYL4lvoMW7YSTio6 gvREziaT3gBmqSz6LxUPfahfp88fTl1BQa4tEj3DoBaBb111CCUrFMUtp8zQQ523oDEX dP7ZSMNGbpCbQTdURavFYvq2W/h9zfpHGeoJFdhSB3rHmE6N/nba/+xl1du3SzpPrxa1 Ha7wtt3fxVo254V6ZXg3ewBDExnSeWRmhXlckud7EMZ/Hz7jOIvI2CjZyJK7izYP4QnI I8qA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g12-20020a170902934c00b0019a59b3c552si12580685plp.531.2023.02.13.18.14.30; Mon, 13 Feb 2023 18:14:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231202AbjBNCFd (ORCPT + 99 others); Mon, 13 Feb 2023 21:05:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229738AbjBNCFc (ORCPT ); Mon, 13 Feb 2023 21:05:32 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CA3012F0B; Mon, 13 Feb 2023 18:05:29 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PG4Kw2Snzz4f3jZH; Tue, 14 Feb 2023 10:05:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP3 (Coremail) with SMTP id _Ch0CgCnUiBk7OpjvrkRDQ--.53521S6; Tue, 14 Feb 2023 10:05:26 +0800 (CST) From: Ye Bin To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jack@suse.cz, Ye Bin Subject: [PATCH v3 2/2] ext4: make sure fs error flag setted before clear journal error Date: Tue, 14 Feb 2023 10:29:05 +0800 Message-Id: <20230214022905.765088-3-yebin@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230214022905.765088-1-yebin@huaweicloud.com> References: <20230214022905.765088-1-yebin@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgCnUiBk7OpjvrkRDQ--.53521S6 X-Coremail-Antispam: 1UD129KBjvdXoWrtryDXF13GrW7XryxXryrZwb_yoWkXwbEq3 yxAan5Wrs3Ar1Ika1rCan8Ww1vvws2vFn8X3ZayF15uryDXa4kCa4DWryfurn8urZ5KrZ8 JF18ZFn3GaykXjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbV8YFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7IE14v26r15M2 8IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK 021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r 4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_ GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx 0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWU JVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJV W8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF 1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6x IIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvE x4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvj DU0xZFpf9x07jeWlkUUUUU= X-CM-SenderInfo: p1hex046kxt4xhlfz01xgou0bp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757770818483891939?= X-GMAIL-MSGID: =?utf-8?q?1757770818483891939?= From: Ye Bin Now, jounral error number maybe cleared even though ext4_commit_super() failed. This may lead to error flag miss, then fsck will miss to check file system deeply. Signed-off-by: Ye Bin Reviewed-by: Baokun Li Reviewed-by: Jan Kara --- fs/ext4/super.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index b94754ba8556..619ef6d021d4 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -6163,11 +6163,13 @@ static int ext4_clear_journal_err(struct super_block *sb, errstr = ext4_decode_error(sb, j_errno, nbuf); ext4_warning(sb, "Filesystem error recorded " "from previous mount: %s", errstr); - ext4_warning(sb, "Marking fs in need of filesystem check."); EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS; es->s_state |= cpu_to_le16(EXT4_ERROR_FS); - ext4_commit_super(sb); + j_errno = ext4_commit_super(sb); + if (j_errno) + return j_errno; + ext4_warning(sb, "Marked fs in need of filesystem check."); jbd2_journal_clear_err(journal); jbd2_journal_update_sb_errno(journal);