From patchwork Fri Jan 26 08:35:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Yue X-Patchwork-Id: 10185295 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 3BF0960383 for ; Fri, 26 Jan 2018 08:31:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A5C6290EB for ; Fri, 26 Jan 2018 08:31:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EF4D290F6; Fri, 26 Jan 2018 08:31:22 +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 C2C2F290EB for ; Fri, 26 Jan 2018 08:31:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752486AbeAZIbU (ORCPT ); Fri, 26 Jan 2018 03:31:20 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:2977 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752438AbeAZIaz (ORCPT ); Fri, 26 Jan 2018 03:30:55 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="36018048" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 Jan 2018 16:30:48 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 4852E49F19BC for ; Fri, 26 Jan 2018 16:30:49 +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; Fri, 26 Jan 2018 16:30:48 +0800 From: Su Yue To: CC: Subject: [PATCH 08/15] btrfs-progs: lowmem check: call get_dir_isize() after repair Date: Fri, 26 Jan 2018 16:35:12 +0800 Message-ID: <20180126083519.28373-9-suy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180126083519.28373-1-suy.fnst@cn.fujitsu.com> References: <20180126083519.28373-1-suy.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.31] X-yoursite-MailScanner-ID: 4852E49F19BC.AD005 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 Since lowmem repair may change size of inode item, introduce get_dir_isize() to fetch isize after traversing items of inode. Signed-off-by: Su Yue --- cmds-check.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/cmds-check.c b/cmds-check.c index caac71a67472..e57eea4e61c9 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -5868,6 +5868,35 @@ out: return ret; } +static int get_dir_isize(struct btrfs_root *root, u64 ino, u64 *size_ret) +{ + struct btrfs_inode_item *ii; + struct btrfs_key key; + struct btrfs_path path; + int ret; + + key.objectid = ino; + key.type = BTRFS_INODE_ITEM_KEY; + key.offset = 0; + + btrfs_init_path(&path); + ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0); + if (ret > 0) + ret = -ENOENT; + if (ret) + goto out; + + ii = btrfs_item_ptr(path.nodes[0], path.slots[0], + struct btrfs_inode_item); + *size_ret = btrfs_inode_size(path.nodes[0], ii); + ret = 0; +out: + if (ret) + error("failed to get isize of inode %llu root %llu", + ino, root->root_key.objectid); + return ret; +} + /* * Traverse the given DIR_ITEM/DIR_INDEX and check related INODE_ITEM and * call find_inode_ref() to check related INODE_REF/INODE_EXTREF. @@ -6591,6 +6620,7 @@ out: if (repair && (err & DIR_COUNT_AGAIN)) { err &= ~DIR_COUNT_AGAIN; count_dir_isize(root, inode_id, &size); + get_dir_isize(root, inode_id, &isize); } if ((nlink != 1 || refs != 1) && repair) {