From patchwork Wed Sep 27 08:28:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Yue X-Patchwork-Id: 9973413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4939E60365 for ; Wed, 27 Sep 2017 08:26:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38548290D2 for ; Wed, 27 Sep 2017 08:26:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D22E290D4; Wed, 27 Sep 2017 08:26:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 989D5290D2 for ; Wed, 27 Sep 2017 08:26:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752399AbdI0I0R (ORCPT ); Wed, 27 Sep 2017 04:26:17 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:65072 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752329AbdI0I0P (ORCPT ); Wed, 27 Sep 2017 04:26:15 -0400 X-IronPort-AV: E=Sophos;i="5.42,444,1500912000"; d="scan'208";a="28480159" Received: from localhost (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 27 Sep 2017 16:25:42 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 4380447CAAC6; Wed, 27 Sep 2017 16:25:40 +0800 (CST) Received: from archlinux.g08.fujitsu.local (10.167.226.129) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Wed, 27 Sep 2017 16:25:39 +0800 From: Su Yue To: CC: Subject: [PATCH v3 2/5] btrfs-progs: check: call repair_root_items() before any repair Date: Wed, 27 Sep 2017 16:28:39 +0800 Message-ID: <20170927082839.5693-1-suy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170927063440.25961-3-suy.fnst@cn.fujitsu.com> References: <20170927063440.25961-3-suy.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.129] X-yoursite-MailScanner-ID: 4380447CAAC6.A82D5 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: suy.fnst@cn.fujitsu.com Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Annotation of repair_root_items(): "This must be run before any other repair code - not doing it so, makes other repair code delete or modify backrefs in the extent tree for example, which will result in an inconsistent fs after repairing the root items." However, the rule was broken by commit 1f728b1a514f ("Btrfs-progs, fsck: move root items repair after root rebuilding"). The commit intends to fix failure of test-fsck/013 so it moves repair_root_items() after check_extents_and_chunks(). The correct way is to skip calling repair_root_item() when init_extent_tree is nonzero. Now put repair_root_items() before do_check_chunks_and_extents() and not call repair_root_items() if do init_extent_tree. Then test-fsck/013 works well. Signed-off-by: Su Yue --- Changelog: v2: Correct commit number reported. (Suggested by Qu Wenruo) v3: Change commit format. (Suggested by Qu Wenruo) cmds-check.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/cmds-check.c b/cmds-check.c index 93b47194..3e2f9faa 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -14644,32 +14644,35 @@ int cmd_check(int argc, char **argv) goto close_out; } + if (!init_extent_tree) { + ret = repair_root_items(info); + err |= !!ret; + if (ret < 0) { + error("failed to repair root items: %s", + strerror(-ret)); + goto close_out; + } + if (repair) { + fprintf(stderr, "Fixed %d roots.\n", ret); + ret = 0; + } else if (ret > 0) { + fprintf(stderr, + "Found %d roots with an outdated root item.\n", + ret); + fprintf(stderr, + "Please run a filesystem check with the option --repair to fix them.\n"); + ret = 1; + err |= !!ret; + goto close_out; + } + } + ret = do_check_chunks_and_extents(info); err |= !!ret; if (ret) error( "errors found in extent allocation tree or chunk allocation"); - ret = repair_root_items(info); - err |= !!ret; - if (ret < 0) { - error("failed to repair root items: %s", strerror(-ret)); - goto close_out; - } - if (repair) { - fprintf(stderr, "Fixed %d roots.\n", ret); - ret = 0; - } else if (ret > 0) { - fprintf(stderr, - "Found %d roots with an outdated root item.\n", - ret); - fprintf(stderr, - "Please run a filesystem check with the option --repair to fix them.\n"); - ret = 1; - err |= !!ret; - goto close_out; - } - if (!ctx.progress_enabled) { if (btrfs_fs_compat_ro(info, FREE_SPACE_TREE)) fprintf(stderr, "checking free space tree\n");