From patchwork Fri Jan 26 08:35:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Su Yue X-Patchwork-Id: 10185279 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 566E960383 for ; Fri, 26 Jan 2018 08:30:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4533129045 for ; Fri, 26 Jan 2018 08:30:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A44C290F6; Fri, 26 Jan 2018 08:30:58 +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 D5B2E29045 for ; Fri, 26 Jan 2018 08:30:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752450AbeAZIa4 (ORCPT ); Fri, 26 Jan 2018 03:30:56 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:34399 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752385AbeAZIax (ORCPT ); Fri, 26 Jan 2018 03:30:53 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="36018043" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 26 Jan 2018 16:30:47 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 7D0A549F19B8 for ; Fri, 26 Jan 2018 16:30:46 +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:45 +0800 From: Su Yue To: CC: Subject: [PATCH 03/15] btrfs-progs: lowmem check: find filetype in repair_inode_missing() Date: Fri, 26 Jan 2018 16:35:07 +0800 Message-ID: <20180126083519.28373-4-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: 7D0A549F19B8.AC528 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 parameter @filetype is 0, repair_inode_missing will find filetype automatically. And let it return -EEXIST instead of 0 if inode item is existed. Signed-off-by: Su Yue Reviewed-by: Qu Wenruo --- cmds-check.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/cmds-check.c b/cmds-check.c index b200fdccf0e5..08a2662e603c 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -5161,6 +5161,9 @@ out: /* * Insert the missing inode item. * + * @filetype: if 0, find file type automatically. + * if find nothing, set inode as regular file. + * * Returns 0 means success. * Returns <0 means error. */ @@ -5176,6 +5179,19 @@ static int repair_inode_item_missing(struct btrfs_root *root, u64 ino, key.type = BTRFS_INODE_ITEM_KEY; key.offset = 0; + if (!filetype) { + ret = find_file_type_lowmem(root, ino, &filetype); + if (ret) { + ret = guess_file_type_lowmem(root, ino, &filetype); + if (ret) { + filetype = BTRFS_FT_REG_FILE; + error( + "can't get file type for inode %llu, using FILE as fallback", + ino); + } + } + } + btrfs_init_path(&path); trans = btrfs_start_transaction(root, 1); if (IS_ERR(trans)) { @@ -5184,7 +5200,9 @@ static int repair_inode_item_missing(struct btrfs_root *root, u64 ino, } ret = btrfs_search_slot(trans, root, &key, &path, 1, 1); - if (ret < 0 || !ret) + if (!ret) + ret = -EEXIST; + if (ret < 0) goto fail; /* insert inode item */