From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FD47C433FE for ; Fri, 11 Dec 2020 08:06:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9C5523E56 for ; Fri, 11 Dec 2020 08:06:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405447AbgLKIFX (ORCPT ); Fri, 11 Dec 2020 03:05:23 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:9159 "EHLO szxga04-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405495AbgLKIEw (ORCPT ); Fri, 11 Dec 2020 03:04:52 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4Csjw8240Tz15bZ6; Fri, 11 Dec 2020 16:03:36 +0800 (CST) Received: from [10.174.179.174] (10.174.179.174) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.487.0; Fri, 11 Dec 2020 16:04:01 +0800 To: CC: , "liuzhiqiang (I)" , linfeilong , From: Haotian Li Subject: [PATCH] e2fsck: Avoid changes on recovery flags when jbd2_journal_recover() failed Message-ID: <1bb3c556-4635-061b-c2dc-df10c15e6398@huawei.com> Date: Fri, 11 Dec 2020 16:04:01 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset="gbk" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.179.174] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org jbd2_journal_revocer() may fail when some error occers such as ENOMEM. However, jsb->s_start is still cleared by func e2fsck_journal_release(). This may break consistency between metadata and data in disk. Sometimes, failure in jbd2_journal_revocer() is temporary but retry e2fsck will skip the journal recovery when the temporary problem is fixed. To fix this case, we use "fatal_error" instead "goto errout" when recover journal failed. We think if journal recovery fails, we need send error message to user and reserve the recovery flags to recover the journal when try e2fsck again. Reported-by: Liangyun Signed-off-by: Haotian Li Signed-off-by: Zhiqiang Liu --- e2fsck/journal.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/e2fsck/journal.c b/e2fsck/journal.c index 7d9f1b40..546beafd 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -952,8 +952,13 @@ static errcode_t recover_ext3_journal(e2fsck_t ctx) goto errout; retval = -jbd2_journal_recover(journal); - if (retval) - goto errout; + if (retval && retval != EFSBADCRC && retval != EFSCORRUPTED) { + ctx->fs->flags &= ~EXT2_FLAG_VALID; + com_err(ctx->program_name, 0, + _("Journal recovery failed " + "on %s\n"), ctx->device_name); + fatal_error(ctx, 0); + } if (journal->j_failed_commit) { pctx.ino = journal->j_failed_commit; -- 2.19.1