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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 C8B34C4338F for ; Tue, 24 Aug 2021 17:13:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A84A561056 for ; Tue, 24 Aug 2021 17:13:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239429AbhHXRNy (ORCPT ); Tue, 24 Aug 2021 13:13:54 -0400 Received: from smtp-out2.suse.de ([195.135.220.29]:54594 "EHLO smtp-out2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235276AbhHXRLk (ORCPT ); Tue, 24 Aug 2021 13:11:40 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 312AA2008D; Tue, 24 Aug 2021 17:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1629825055; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FTX6rOZiHdjmW9PHEniM14du06Yr497KPhWbg+ti1hM=; b=K9I9k8KTBwNOy1IJDB/DqhQbpbfwazbE2cHUSYtlnmhP7Lzlm0q/4ZseBq2bVPxKEINNmP eJQ4kDbdtXpPFZdOjVIUUjW1nFk17snBFLz6nIQxNm+JD3VUQR2hk6ZJgdojrnCs2i7rfZ jjx3E4NKofFQS7G92lAcOZdoToQfSt8= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id CE23913B45; Tue, 24 Aug 2021 17:10:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id MFXOJB0oJWGDNwAAMHmgww (envelope-from ); Tue, 24 Aug 2021 17:10:53 +0000 From: Marcos Paulo de Souza To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.com, nborisov@suse.com, Marcos Paulo de Souza Subject: [PATCH 2/7] btrfs: block-group: use btrfs_for_each_slot in find_first_block_group Date: Tue, 24 Aug 2021 14:06:53 -0300 Message-Id: <20210824170658.12567-3-mpdesouza@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210824170658.12567-1-mpdesouza@suse.com> References: <20210824170658.12567-1-mpdesouza@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The function can be simplified by using the iterator like macro. No functional changes. Signed-off-by: Marcos Paulo de Souza --- fs/btrfs/block-group.c | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index 1f8b06afbd03..0d999a3bfc84 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -1654,38 +1654,15 @@ static int find_first_block_group(struct btrfs_fs_info *fs_info, struct btrfs_path *path, struct btrfs_key *key) { - struct btrfs_root *root = fs_info->extent_root; - int ret; struct btrfs_key found_key; - struct extent_buffer *leaf; - int slot; - - ret = btrfs_search_slot(NULL, root, key, path, 0, 0); - if (ret < 0) - return ret; - - while (1) { - slot = path->slots[0]; - leaf = path->nodes[0]; - if (slot >= btrfs_header_nritems(leaf)) { - ret = btrfs_next_leaf(root, path); - if (ret == 0) - continue; - if (ret < 0) - goto out; - break; - } - btrfs_item_key_to_cpu(leaf, &found_key, slot); + int ret; + btrfs_for_each_slot(fs_info->extent_root, key, &found_key, path, ret) { if (found_key.objectid >= key->objectid && - found_key.type == BTRFS_BLOCK_GROUP_ITEM_KEY) { - ret = read_bg_from_eb(fs_info, &found_key, path); - break; - } - - path->slots[0]++; + found_key.type == BTRFS_BLOCK_GROUP_ITEM_KEY) + return read_bg_from_eb(fs_info, &found_key, path); } -out: + return ret; } -- 2.31.1