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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 6ED37C169C4 for ; Mon, 11 Feb 2019 13:00:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33960218D8 for ; Mon, 11 Feb 2019 13:00:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727522AbfBKNAy (ORCPT ); Mon, 11 Feb 2019 08:00:54 -0500 Received: from mx2.suse.de ([195.135.220.15]:38724 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726025AbfBKNAy (ORCPT ); Mon, 11 Feb 2019 08:00:54 -0500 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 936DAAECD for ; Mon, 11 Feb 2019 13:00:51 +0000 (UTC) Subject: Re: [PATCH v3 5/9] btrfs: ref-verify: Use btrfs_ref to refactor btrfs_ref_tree_mod() To: Qu Wenruo , linux-btrfs@vger.kernel.org References: <20190211051653.3167-1-wqu@suse.com> <20190211051653.3167-6-wqu@suse.com> From: Nikolay Borisov Openpgp: preference=signencrypt Autocrypt: addr=nborisov@suse.com; prefer-encrypt=mutual; keydata= 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 Message-ID: <774bc156-2d63-117f-a490-56c58587c554@suse.com> Date: Mon, 11 Feb 2019 15:00:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20190211051653.3167-6-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 11.02.19 г. 7:16 ч., Qu Wenruo wrote: > It's a perfect match for btrfs_ref_tree_mod() to use btrfs_ref, as > btrfs_ref describes a metadata/data reference update comprehensively. > > Now we have one less function use confusing owner/level trick. > > Signed-off-by: Qu Wenruo Reviewed-by: Nikolay Borisov > --- > fs/btrfs/extent-tree.c | 27 +++++++-------------- > fs/btrfs/ref-verify.c | 53 ++++++++++++++++++++++++------------------ > fs/btrfs/ref-verify.h | 10 ++++---- > 3 files changed, 42 insertions(+), 48 deletions(-) > > diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c > index 36516b33d07f..fea552f92a2c 100644 > --- a/fs/btrfs/extent-tree.c > +++ b/fs/btrfs/extent-tree.c > @@ -2055,9 +2055,6 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, > BUG_ON(owner < BTRFS_FIRST_FREE_OBJECTID && > root_objectid == BTRFS_TREE_LOG_OBJECTID); > > - btrfs_ref_tree_mod(root, bytenr, num_bytes, parent, root_objectid, > - owner, offset, BTRFS_ADD_DELAYED_REF); > - > btrfs_init_generic_ref(&generic_ref, BTRFS_ADD_DELAYED_REF, bytenr, > num_bytes, parent); > generic_ref.real_root = root->root_key.objectid; > @@ -2071,6 +2068,8 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, > &old_ref_mod, &new_ref_mod); > } > > + btrfs_ref_tree_mod(fs_info, &generic_ref); > + > if (ret == 0 && old_ref_mod < 0 && new_ref_mod >= 0) { > bool metadata = owner < BTRFS_FIRST_FREE_OBJECTID; > > @@ -7289,10 +7288,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, > if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) { > int old_ref_mod, new_ref_mod; > > - btrfs_ref_tree_mod(root, buf->start, buf->len, parent, > - root->root_key.objectid, > - btrfs_header_level(buf), 0, > - BTRFS_DROP_DELAYED_REF); > + btrfs_ref_tree_mod(fs_info, &generic_ref); > ret = btrfs_add_delayed_tree_ref(trans, &generic_ref, NULL, > &old_ref_mod, &new_ref_mod); > BUG_ON(ret); /* -ENOMEM */ > @@ -7353,11 +7349,6 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, > if (btrfs_is_testing(fs_info)) > return 0; > > - if (root_objectid != BTRFS_TREE_LOG_OBJECTID) > - btrfs_ref_tree_mod(root, bytenr, num_bytes, parent, > - root_objectid, owner, offset, > - BTRFS_DROP_DELAYED_REF); > - > btrfs_init_generic_ref(&generic_ref, BTRFS_DROP_DELAYED_REF, bytenr, > num_bytes, parent); > generic_ref.real_root = root->root_key.objectid; > @@ -7381,6 +7372,9 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, > &old_ref_mod, &new_ref_mod); > } > > + if (root_objectid != BTRFS_TREE_LOG_OBJECTID) > + btrfs_ref_tree_mod(fs_info, &generic_ref); > + > if (ret == 0 && old_ref_mod >= 0 && new_ref_mod < 0) { > bool metadata = owner < BTRFS_FIRST_FREE_OBJECTID; > > @@ -8490,13 +8484,10 @@ int btrfs_alloc_reserved_file_extent(struct btrfs_trans_handle *trans, > > BUG_ON(root->root_key.objectid == BTRFS_TREE_LOG_OBJECTID); > > - btrfs_ref_tree_mod(root, ins->objectid, ins->offset, 0, > - root->root_key.objectid, owner, offset, > - BTRFS_ADD_DELAYED_EXTENT); > - > btrfs_init_generic_ref(&generic_ref, BTRFS_ADD_DELAYED_EXTENT, > ins->objectid, ins->offset, 0); > btrfs_init_data_ref(&generic_ref, root->root_key.objectid, owner, offset); > + btrfs_ref_tree_mod(root->fs_info, &generic_ref); > ret = btrfs_add_delayed_data_ref(trans, &generic_ref, > ram_bytes, NULL, NULL); > return ret; > @@ -8745,13 +8736,11 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans, > extent_op->is_data = false; > extent_op->level = level; > > - btrfs_ref_tree_mod(root, ins.objectid, ins.offset, parent, > - root_objectid, level, 0, > - BTRFS_ADD_DELAYED_EXTENT); > btrfs_init_generic_ref(&generic_ref, BTRFS_ADD_DELAYED_EXTENT, > ins.objectid, ins.offset, parent); > generic_ref.real_root = root->root_key.objectid; > btrfs_init_tree_ref(&generic_ref, level, root_objectid); > + btrfs_ref_tree_mod(fs_info, &generic_ref); > ret = btrfs_add_delayed_tree_ref(trans, &generic_ref, > extent_op, NULL, NULL); > if (ret) > diff --git a/fs/btrfs/ref-verify.c b/fs/btrfs/ref-verify.c > index d09b6cdb785a..4a0f6289ef17 100644 > --- a/fs/btrfs/ref-verify.c > +++ b/fs/btrfs/ref-verify.c > @@ -670,36 +670,43 @@ static void dump_block_entry(struct btrfs_fs_info *fs_info, > > /* > * btrfs_ref_tree_mod: called when we modify a ref for a bytenr > - * @root: the root we are making this modification from. > - * @bytenr: the bytenr we are modifying. > - * @num_bytes: number of bytes. > - * @parent: the parent bytenr. > - * @ref_root: the original root owner of the bytenr. > - * @owner: level in the case of metadata, inode in the case of data. > - * @offset: 0 for metadata, file offset for data. > - * @action: the action that we are doing, this is the same as the delayed ref > - * action. > * > * This will add an action item to the given bytenr and do sanity checks to make > * sure we haven't messed something up. If we are making a new allocation and > * this block entry has history we will delete all previous actions as long as > * our sanity checks pass as they are no longer needed. > */ > -int btrfs_ref_tree_mod(struct btrfs_root *root, u64 bytenr, u64 num_bytes, > - u64 parent, u64 ref_root, u64 owner, u64 offset, > - int action) > +int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info, > + struct btrfs_ref *generic_ref) > { > - struct btrfs_fs_info *fs_info = root->fs_info; > struct ref_entry *ref = NULL, *exist; > struct ref_action *ra = NULL; > struct block_entry *be = NULL; > struct root_entry *re = NULL; > + int action = generic_ref->action; > int ret = 0; > - bool metadata = owner < BTRFS_FIRST_FREE_OBJECTID; > + bool metadata; > + u64 bytenr = generic_ref->bytenr; > + u64 num_bytes = generic_ref->len; > + u64 parent = generic_ref->parent; > + u64 ref_root; > + u64 owner; > + u64 offset; > > - if (!btrfs_test_opt(root->fs_info, REF_VERIFY)) > + if (!btrfs_test_opt(fs_info, REF_VERIFY)) > return 0; > > + if (generic_ref->type == BTRFS_REF_METADATA) { > + ref_root = generic_ref->tree_ref.root; > + owner = generic_ref->tree_ref.level; > + offset = 0; > + } else { > + ref_root = generic_ref->data_ref.ref_root; > + owner = generic_ref->data_ref.ino; > + offset = generic_ref->data_ref.offset; > + } > + metadata = owner < BTRFS_FIRST_FREE_OBJECTID; > + > ref = kzalloc(sizeof(struct ref_entry), GFP_NOFS); > ra = kmalloc(sizeof(struct ref_action), GFP_NOFS); > if (!ra || !ref) { > @@ -732,7 +739,7 @@ int btrfs_ref_tree_mod(struct btrfs_root *root, u64 bytenr, u64 num_bytes, > > INIT_LIST_HEAD(&ra->list); > ra->action = action; > - ra->root = root->root_key.objectid; > + ra->root = generic_ref->real_root; > > /* > * This is an allocation, preallocate the block_entry in case we haven't > @@ -745,7 +752,7 @@ int btrfs_ref_tree_mod(struct btrfs_root *root, u64 bytenr, u64 num_bytes, > * is and the new root objectid, so let's not treat the passed > * in root as if it really has a ref for this bytenr. > */ > - be = add_block_entry(root->fs_info, bytenr, num_bytes, ref_root); > + be = add_block_entry(fs_info, bytenr, num_bytes, ref_root); > if (IS_ERR(be)) { > kfree(ra); > ret = PTR_ERR(be); > @@ -787,13 +794,13 @@ int btrfs_ref_tree_mod(struct btrfs_root *root, u64 bytenr, u64 num_bytes, > * one we want to lookup below when we modify the > * re->num_refs. > */ > - ref_root = root->root_key.objectid; > - re->root_objectid = root->root_key.objectid; > + ref_root = generic_ref->real_root; > + re->root_objectid = generic_ref->real_root; > re->num_refs = 0; > } > > - spin_lock(&root->fs_info->ref_verify_lock); > - be = lookup_block_entry(&root->fs_info->block_tree, bytenr); > + spin_lock(&fs_info->ref_verify_lock); > + be = lookup_block_entry(&fs_info->block_tree, bytenr); > if (!be) { > btrfs_err(fs_info, > "trying to do action %d to bytenr %llu num_bytes %llu but there is no existing entry!", > @@ -862,7 +869,7 @@ int btrfs_ref_tree_mod(struct btrfs_root *root, u64 bytenr, u64 num_bytes, > * didn't think of some other corner case. > */ > btrfs_err(fs_info, "failed to find root %llu for %llu", > - root->root_key.objectid, be->bytenr); > + generic_ref->real_root, be->bytenr); > dump_block_entry(fs_info, be); > dump_ref_action(fs_info, ra); > kfree(ra); > @@ -881,7 +888,7 @@ int btrfs_ref_tree_mod(struct btrfs_root *root, u64 bytenr, u64 num_bytes, > list_add_tail(&ra->list, &be->actions); > ret = 0; > out_unlock: > - spin_unlock(&root->fs_info->ref_verify_lock); > + spin_unlock(&fs_info->ref_verify_lock); > out: > if (ret) > btrfs_clear_opt(fs_info->mount_opt, REF_VERIFY); > diff --git a/fs/btrfs/ref-verify.h b/fs/btrfs/ref-verify.h > index b7d2a4edfdb7..855de37719b5 100644 > --- a/fs/btrfs/ref-verify.h > +++ b/fs/btrfs/ref-verify.h > @@ -9,9 +9,8 @@ > #ifdef CONFIG_BTRFS_FS_REF_VERIFY > int btrfs_build_ref_tree(struct btrfs_fs_info *fs_info); > void btrfs_free_ref_cache(struct btrfs_fs_info *fs_info); > -int btrfs_ref_tree_mod(struct btrfs_root *root, u64 bytenr, u64 num_bytes, > - u64 parent, u64 ref_root, u64 owner, u64 offset, > - int action); > +int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info, > + struct btrfs_ref *generic_ref); > void btrfs_free_ref_tree_range(struct btrfs_fs_info *fs_info, u64 start, > u64 len); > > @@ -30,9 +29,8 @@ static inline void btrfs_free_ref_cache(struct btrfs_fs_info *fs_info) > { > } > > -static inline int btrfs_ref_tree_mod(struct btrfs_root *root, u64 bytenr, > - u64 num_bytes, u64 parent, u64 ref_root, > - u64 owner, u64 offset, int action) > +static inline int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info, > + struct btrfs_ref *generic_ref) > { > return 0; > } >