From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:40847 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752321AbdGLWTO (ORCPT ); Wed, 12 Jul 2017 18:19:14 -0400 From: Edmund Nadolski To: enadolski@suse.com, dsterba@suse.cz, jeffm@suse.com, linux-btrfs@vger.kernel.org, lufq.fnst@cn.fujitsu.com Subject: [PATCH v3 13/13] btrfs: clean up extraneous computations in add_delayed_refs Date: Wed, 12 Jul 2017 16:20:11 -0600 Message-Id: <20170712222011.26705-7-enadolski@suse.com> In-Reply-To: <20170712222011.26705-1-enadolski@suse.com> References: <20170712222011.26705-1-enadolski@suse.com> Sender: linux-btrfs-owner@vger.kernel.org List-ID: Repeating the same computation in multiple places is not necessary. Signed-off-by: Edmund Nadolski Signed-off-by: Jeff Mahoney --- fs/btrfs/backref.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 35ac0bd..e62704a 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c @@ -769,7 +769,7 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, struct btrfs_key key; struct btrfs_key tmp_op_key; struct btrfs_key *op_key = NULL; - int sgn; + int count; int ret = 0; if (extent_op && extent_op->update_key) { @@ -788,15 +788,15 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, WARN_ON(1); continue; case BTRFS_ADD_DELAYED_REF: - sgn = 1; + count = node->ref_mod; break; case BTRFS_DROP_DELAYED_REF: - sgn = -1; + count = node->ref_mod * -1; break; default: BUG_ON(1); } - *total_refs += (node->ref_mod * sgn); + *total_refs += count; switch (node->type) { case BTRFS_TREE_BLOCK_REF_KEY: { /* NORMAL INDIRECT METADATA backref */ @@ -805,9 +805,8 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, ref = btrfs_delayed_node_to_tree_ref(node); ret = add_indirect_ref(fs_info, preftrees, ref->root, &tmp_op_key, ref->level + 1, - node->bytenr, - node->ref_mod * sgn, - sc, GFP_ATOMIC); + node->bytenr, count, sc, + GFP_ATOMIC); break; } case BTRFS_SHARED_BLOCK_REF_KEY: { @@ -816,9 +815,8 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, ref = btrfs_delayed_node_to_tree_ref(node); - ret = add_direct_ref(fs_info, preftrees, - ref->level + 1, ref->parent, - node->bytenr, node->ref_mod * sgn, + ret = add_direct_ref(fs_info, preftrees, ref->level + 1, + ref->parent, node->bytenr, count, sc, GFP_ATOMIC); break; } @@ -841,9 +839,8 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, } ret = add_indirect_ref(fs_info, preftrees, ref->root, - &key, 0, node->bytenr, - node->ref_mod * sgn, - sc, GFP_ATOMIC); + &key, 0, node->bytenr, count, sc, + GFP_ATOMIC); break; } case BTRFS_SHARED_DATA_REF_KEY: { @@ -852,10 +849,9 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, ref = btrfs_delayed_node_to_data_ref(node); - ret = add_direct_ref(fs_info, preftrees, 0, - ref->parent, node->bytenr, - node->ref_mod * sgn, - sc, GFP_ATOMIC); + ret = add_direct_ref(fs_info, preftrees, 0, ref->parent, + node->bytenr, count, sc, + GFP_ATOMIC); break; } default: -- 2.10.2