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=-9.8 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_GIT 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 01C65C47247 for ; Tue, 5 May 2020 00:02:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D3400206CC for ; Tue, 5 May 2020 00:02:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728376AbgEEACp (ORCPT ); Mon, 4 May 2020 20:02:45 -0400 Received: from mx2.suse.de ([195.135.220.15]:38762 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728223AbgEEACo (ORCPT ); Mon, 4 May 2020 20:02:44 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 27BF4AEE7 for ; Tue, 5 May 2020 00:02:45 +0000 (UTC) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH v4 05/11] btrfs-progs: block-group: Rename write_one_cahce_group() Date: Tue, 5 May 2020 08:02:24 +0800 Message-Id: <20200505000230.4454-6-wqu@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200505000230.4454-1-wqu@suse.com> References: <20200505000230.4454-1-wqu@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The name of this function contains the word "cache", which is left from the era where btrfs_block_group is called btrfs_block_group_cache. Now this "cache" doesn't match any thing, and we have better namings for functions like read/insert/remove_block_group_item(). So rename this function to update_block_group_item(). Since we're here, also rename the local variables to be more like a Chrismas tree, and rename @extent_root to @root for later reuse. And replace the BUG_ON() with proper error handling. Signed-off-by: Qu Wenruo --- extent-tree.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/extent-tree.c b/extent-tree.c index 911fd25f3c6e..89e38e2ed7ae 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -1527,25 +1527,28 @@ int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, return __btrfs_mod_ref(trans, root, buf, record_parent, 0); } -static int write_one_cache_group(struct btrfs_trans_handle *trans, - struct btrfs_path *path, - struct btrfs_block_group *cache) +static int update_block_group_item(struct btrfs_trans_handle *trans, + struct btrfs_path *path, + struct btrfs_block_group *cache) { - int ret; - struct btrfs_root *extent_root = trans->fs_info->extent_root; - unsigned long bi; + struct btrfs_fs_info *fs_info = trans->fs_info; struct btrfs_block_group_item bgi; struct extent_buffer *leaf; + struct btrfs_root *root; struct btrfs_key key; + unsigned long bi; + int ret; key.objectid = cache->start; key.type = BTRFS_BLOCK_GROUP_ITEM_KEY; key.offset = cache->length; + root = fs_info->extent_root; - ret = btrfs_search_slot(trans, extent_root, &key, path, 0, 1); + ret = btrfs_search_slot(trans, root, &key, path, 0, 1); + if (ret > 0) + ret = -ENOENT; if (ret < 0) goto fail; - BUG_ON(ret); leaf = path->nodes[0]; bi = btrfs_item_ptr_offset(leaf, path->slots[0]); @@ -1555,11 +1558,9 @@ static int write_one_cache_group(struct btrfs_trans_handle *trans, BTRFS_FIRST_CHUNK_TREE_OBJECTID); write_extent_buffer(leaf, &bgi, bi, sizeof(bgi)); btrfs_mark_buffer_dirty(leaf); - btrfs_release_path(path); fail: - if (ret) - return ret; - return 0; + btrfs_release_path(path); + return ret; } @@ -1577,7 +1578,7 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans) cache = list_first_entry(&trans->dirty_bgs, struct btrfs_block_group, dirty_list); list_del_init(&cache->dirty_list); - ret = write_one_cache_group(trans, path, cache); + ret = update_block_group_item(trans, path, cache); if (ret) break; } -- 2.26.2