From patchwork Tue Jan 9 07:52:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Yue X-Patchwork-Id: 10151039 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 1A168603ED for ; Tue, 9 Jan 2018 07:48:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FC75288FD for ; Tue, 9 Jan 2018 07:48:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0426928906; Tue, 9 Jan 2018 07:48:37 +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 82342288FD for ; Tue, 9 Jan 2018 07:48:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753668AbeAIHse (ORCPT ); Tue, 9 Jan 2018 02:48:34 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:58578 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752763AbeAIHsd (ORCPT ); Tue, 9 Jan 2018 02:48:33 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="35026473" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 09 Jan 2018 15:48:32 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 1590C486A777; Tue, 9 Jan 2018 15:48:31 +0800 (CST) Received: from archlinux.g08.fujitsu.local (10.167.226.31) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Tue, 9 Jan 2018 15:48:28 +0800 From: Su Yue To: CC: Subject: [PATCH 2/3 v2] btrfs-progs: check: do not reset ret after try_repair_inode Date: Tue, 9 Jan 2018 15:52:51 +0800 Message-ID: <20180109075251.17264-1-suy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171121101524.2014-1-suy.fnst@cn.fujitsu.com> References: <20171121101524.2014-1-suy.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.31] X-yoursite-MailScanner-ID: 1590C486A777.A5D72 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 If repair is enabled and try_repair_inode() failed in check_inode_recs(), then value @ret will be reset to 0 anyway. Then counter @error won't be incremented. In other words, if previous check of the root directory is fine, check_inode_recs() always returns 0 even it failed to repair inodes. So do not reset @ret after try_repair_inode(). Signed-off-by: Su Yue --- Changlog: v1->v2: Add more detailed commit message. --- cmds-check.c | 1 - 1 file changed, 1 deletion(-) diff --git a/cmds-check.c b/cmds-check.c index 635c1c44ff6f..00cbc0114b22 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -3968,7 +3968,6 @@ static int check_inode_recs(struct btrfs_root *root, free_inode_rec(rec); continue; } - ret = 0; } if (!(repair && ret == 0))