public inbox for linux-btrfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Gabriel Niebler <gniebler@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.com, Gabriel Niebler <gniebler@suse.com>,
	Marcos Paulo de Souza <mpdesouza@suse.com>
Subject: [PATCH V4 02/14] btrfs: Use btrfs_for_each_slot in find_first_block_group
Date: Wed,  9 Mar 2022 14:50:39 +0100	[thread overview]
Message-ID: <20220309135051.5738-3-gniebler@suse.com> (raw)
In-Reply-To: <20220309135051.5738-1-gniebler@suse.com>

This function can be simplified by refactoring to use the new iterator macro.

No functional changes.

Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com>
Signed-off-by: Gabriel Niebler <gniebler@suse.com>
---
 fs/btrfs/block-group.c | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
index 8202ad6aa131..aafd7909d0f8 100644
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -1686,35 +1686,13 @@ static int find_first_block_group(struct btrfs_fs_info *fs_info,
 	struct btrfs_root *root = btrfs_block_group_root(fs_info);
 	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);
 
+	btrfs_for_each_slot(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;
+			return read_bg_from_eb(fs_info, &found_key, path);
 		}
-
-		path->slots[0]++;
 	}
-out:
 	return ret;
 }
 
-- 
2.35.1


  parent reply	other threads:[~2022-03-09 13:51 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-09 13:50 [PATCH v4 0/14] btrfs: Introduce macro to iterate over slots Gabriel Niebler
2022-03-09 13:50 ` [PATCH v4 01/14] btrfs: Introduce btrfs_for_each_slot iterator macro Gabriel Niebler
2022-03-09 13:50 ` Gabriel Niebler [this message]
2022-03-09 13:50 ` [PATCH v4 03/14] btrfs: Use btrfs_for_each_slot in mark_block_group_to_copy Gabriel Niebler
2022-03-09 13:50 ` [PATCH v4 04/14] btrfs: Use btrfs_for_each_slot in btrfs_search_dir_index_item Gabriel Niebler
2022-03-09 13:50 ` [PATCH v4 05/14] btrfs: Use btrfs_for_each_slot in btrfs_real_readdir Gabriel Niebler
2022-03-09 13:50 ` [PATCH v4 06/14] btrfs: Use btrfs_for_each_slot in did_create_dir Gabriel Niebler
2022-03-09 13:50 ` [PATCH v4 07/14] btrfs: Use btrfs_for_each_slot in can_rmdir Gabriel Niebler
2022-03-09 13:50 ` [PATCH v4 08/14] btrfs: Use btrfs_for_each_slot in is_ancestor Gabriel Niebler
2022-03-09 13:50 ` [PATCH v4 09/14] btrfs: Use btrfs_for_each_slot in process_all_refs Gabriel Niebler
2022-03-09 13:50 ` [PATCH v4 10/14] btrfs: Use btrfs_for_each_slot in process_all_new_xattrs Gabriel Niebler
2022-03-09 13:50 ` [PATCH v4 11/14] btrfs: Use btrfs_for_each_slot in process_all_extents Gabriel Niebler
2022-03-09 13:50 ` [PATCH v4 12/14] btrfs: Use btrfs_for_each_slot in btrfs_unlink_all_paths Gabriel Niebler
2022-03-09 13:50 ` [PATCH v4 13/14] btrfs: Use btrfs_for_each_slot in btrfs_read_chunk_tree Gabriel Niebler
2022-03-09 13:50 ` [PATCH v4 14/14] btrfs: Use btrfs_for_each_slot in btrfs_listxattr Gabriel Niebler
2022-03-14 19:35 ` [PATCH v4 0/14] btrfs: Introduce macro to iterate over slots David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220309135051.5738-3-gniebler@suse.com \
    --to=gniebler@suse.com \
    --cc=dsterba@suse.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=mpdesouza@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox