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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 A87CFC4740C for ; Mon, 9 Sep 2019 14:17:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E0E52086D for ; Mon, 9 Sep 2019 14:17:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731001AbfIIORg (ORCPT ); Mon, 9 Sep 2019 10:17:36 -0400 Received: from mx2.suse.de ([195.135.220.15]:57680 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730690AbfIIORg (ORCPT ); Mon, 9 Sep 2019 10:17:36 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 2EC93B0BE; Mon, 9 Sep 2019 14:17:33 +0000 (UTC) Subject: Re: [PATCH v2 3/6] btrfs-progs: check/common: Make repair_imode_common() to handle inodes in subvolume trees To: Qu Wenruo , linux-btrfs@vger.kernel.org References: <20190905075800.1633-1-wqu@suse.com> <20190905075800.1633-4-wqu@suse.com> From: Nikolay Borisov Openpgp: preference=signencrypt Autocrypt: addr=nborisov@suse.com; prefer-encrypt=mutual; keydata= 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 Message-ID: <43ed2a81-aa0e-22ff-a3db-202b5c945d18@suse.com> Date: Mon, 9 Sep 2019 17:17:31 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190905075800.1633-4-wqu@suse.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On 5.09.19 г. 10:57 ч., Qu Wenruo wrote: > Before this patch, repair_imode_common() can only handle two types of > inodes: > - Free space cache inodes > - ROOT DIR inodes > > For inodes in subvolume trees, the core complexity is how to determine the > correct imode, thus it was not implemented. > > However there are more reports of incorrect imode in subvolume trees, we > need to support such fix. > > So this patch adds a new function, detect_imode(), to detect imode for > inodes in subvolume trees. > > That function will determine imode by: > - Search for INODE_REF > If we have INODE_REF, we will then try to find DIR_ITEM/DIR_INDEX. > As long as one valid DIR_ITEM or DIR_INDEX can be found, we convert > the BTRFS_FT_* to imode, then call it a day. > This should be the most accurate way. > > - Search for DIR_INDEX/DIR_ITEM > If above search fails, we falls back to locate the DIR_INDEX/DIR_ITEM > just after the INODE_ITEM. > If any can be found, it's definitely a directory. > > - Search for EXTENT_DATA > If EXTENT_DATA can be found, it's either REG or LNK. > For this case, we default to REG, as user can inspect the file to > determine if it's a file or just a path. > > - Use rdev to detect BLK/CHR > If all above fails, but INODE_ITEM has non-zero rdev, then it's either > a BLK or CHR file. Then we default to BLK. > > - Fail out if none of above methods succeeded > No educated guess to make things worse. > > Signed-off-by: Qu Wenruo > --- > check/mode-common.c | 130 +++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 117 insertions(+), 13 deletions(-) > > diff --git a/check/mode-common.c b/check/mode-common.c > index c0ddc50a1dd0..abea2ceda4c4 100644 > --- a/check/mode-common.c > +++ b/check/mode-common.c > @@ -935,6 +935,113 @@ out: > return ret; > } > > +static int detect_imode(struct btrfs_root *root, struct btrfs_path *path, > + u32 *imode_ret) I think the imode is less than u32 so it should be possible to return it directly from the function as a positive number and error as negative? > +{ > + struct btrfs_key key; > + struct btrfs_inode_item iitem; > + const u32 priv = 0700; Having this in a variable doesn't bring more clarity, just use 0700 directly at the end of the function. > + bool found = false; > + u64 ino; > + u32 imode; > + int ret = 0; > + > + btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]); > + ino = key.objectid; > + read_extent_buffer(path->nodes[0], &iitem, > + btrfs_item_ptr_offset(path->nodes[0], path->slots[0]), > + sizeof(iitem)); > + /* root inode */ > + if (ino == BTRFS_FIRST_FREE_OBJECTID) { > + imode = S_IFDIR; > + found = true; > + goto out; > + } > + > + while (1) { > + struct btrfs_inode_ref *iref; > + struct extent_buffer *leaf; > + unsigned long cur; > + unsigned long end; > + char namebuf[BTRFS_NAME_LEN] = {0}; > + u64 index; > + u32 namelen; > + int slot; > + > + ret = btrfs_next_item(root, path); > + if (ret > 0) { > + /* falls back to rdev check */ > + ret = 0; > + goto out; > + } > + if (ret < 0) > + goto out; > + leaf = path->nodes[0]; > + slot = path->slots[0]; > + btrfs_item_key_to_cpu(leaf, &key, slot); > + if (key.objectid != ino) > + goto out; > + > + /* > + * We ignore some types to make life easier: > + * - XATTR > + * Both REG and DIR can have xattr, so not useful > + */ > + switch (key.type) { > + case BTRFS_INODE_REF_KEY: > + /* The most accurate way to determine filetype */ > + cur = btrfs_item_ptr_offset(leaf, slot); > + end = cur + btrfs_item_size_nr(leaf, slot); > + while (cur < end) { > + iref = (struct btrfs_inode_ref *)cur; > + namelen = min_t(u32, end - cur - sizeof(&iref), > + btrfs_inode_ref_name_len(leaf, iref)); > + index = btrfs_inode_ref_index(leaf, iref); > + read_extent_buffer(leaf, namebuf, > + (unsigned long)(iref + 1), namelen); > + ret = find_file_type(root, ino, key.offset, > + index, namebuf, namelen, > + &imode); > + if (ret == 0) { > + found = true; > + goto out; > + } > + cur += sizeof(*iref) + namelen; > + } > + break; > + case BTRFS_DIR_ITEM_KEY: > + case BTRFS_DIR_INDEX_KEY: > + imode = S_IFDIR; > + goto out; > + case BTRFS_EXTENT_DATA_KEY: > + /* > + * Both REG and LINK could have EXTENT_DATA. > + * We just fall back to REG as user can inspect the > + * content. > + */ > + imode = S_IFREG; > + goto out; > + } > + } > + > +out: > + /* > + * Both CHR and BLK uses rdev, no way to distinguish them, so fall back > + * to BLK. But either way it doesn't really matter, as CHR/BLK on btrfs > + * should be pretty rare, and no real data will be lost. > + */ > + if (!found && btrfs_stack_inode_rdev(&iitem) != 0) { > + imode = S_IFBLK; > + found = true; > + } > + > + if (found) > + *imode_ret = (imode | priv); > + else > + ret = -ENOENT; > + return ret; > +} > + > /* > * Reset the inode mode of the inode specified by @path. > * > @@ -951,22 +1058,19 @@ int repair_imode_common(struct btrfs_root *root, struct btrfs_path *path) > u32 imode; > int ret; > > - if (root->root_key.objectid != BTRFS_ROOT_TREE_OBJECTID) { > - error( > - "repair inode mode outside of root tree is not supported yet"); > - return -ENOTTY; > - } > btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]); > ASSERT(key.type == BTRFS_INODE_ITEM_KEY); > - if (key.objectid != BTRFS_ROOT_TREE_DIR_OBJECTID && > - !is_fstree(key.objectid)) { > - error("unsupported ino %llu", key.objectid); > - return -ENOTTY; > + if (root->objectid == BTRFS_ROOT_TREE_OBJECTID) { > + /* In root tree we only have two possible imode */ > + if (key.objectid == BTRFS_ROOT_TREE_OBJECTID) > + imode = S_IFDIR | 0755; > + else > + imode = S_IFREG | 0600; > + } else { > + ret = detect_imode(root, path, &imode); > + if (ret < 0) > + return ret; > } > - if (key.objectid == BTRFS_ROOT_TREE_DIR_OBJECTID) > - imode = 040755; > - else > - imode = 0100600; > > trans = btrfs_start_transaction(root, 1); > if (IS_ERR(trans)) { >