From: Marcos Paulo de Souza <mpdesouza@suse.com>
To: linux-btrfs@vger.kernel.org
Cc: dsterba@suse.com, Marcos Paulo de Souza <mpdesouza@suse.com>
Subject: [PATCH 3/8] btrfs: dev-replace: Use btrfs_for_each_slot in mark_block_group_to_copy
Date: Thu, 26 Aug 2021 13:40:49 -0300 [thread overview]
Message-ID: <20210826164054.14993-4-mpdesouza@suse.com> (raw)
In-Reply-To: <20210826164054.14993-1-mpdesouza@suse.com>
The function can be simplified by using the macro.
No functional changes.
Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com>
---
fs/btrfs/dev-replace.c | 51 +++++++++---------------------------------
1 file changed, 11 insertions(+), 40 deletions(-)
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index d029be40ea6f..6124f2e8e9f1 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -523,63 +523,34 @@ static int mark_block_group_to_copy(struct btrfs_fs_info *fs_info,
key.type = BTRFS_DEV_EXTENT_KEY;
key.offset = 0;
- ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
- if (ret < 0)
- goto free_path;
- if (ret > 0) {
- if (path->slots[0] >=
- btrfs_header_nritems(path->nodes[0])) {
- ret = btrfs_next_leaf(root, path);
- if (ret < 0)
- goto free_path;
- if (ret > 0) {
- ret = 0;
- goto free_path;
- }
- } else {
- ret = 0;
- }
- }
-
- while (1) {
+ btrfs_for_each_slot(root, &key, &found_key, path, ret) {
struct extent_buffer *leaf = path->nodes[0];
- int slot = path->slots[0];
-
- btrfs_item_key_to_cpu(leaf, &found_key, slot);
-
- if (found_key.objectid != src_dev->devid)
- break;
- if (found_key.type != BTRFS_DEV_EXTENT_KEY)
+ if (found_key.objectid != src_dev->devid ||
+ found_key.type != BTRFS_DEV_EXTENT_KEY ||
+ found_key.offset < key.offset)
break;
- if (found_key.offset < key.offset)
- break;
-
- dev_extent = btrfs_item_ptr(leaf, slot, struct btrfs_dev_extent);
+ dev_extent = btrfs_item_ptr(leaf, path->slots[0],
+ struct btrfs_dev_extent);
chunk_offset = btrfs_dev_extent_chunk_offset(leaf, dev_extent);
cache = btrfs_lookup_block_group(fs_info, chunk_offset);
if (!cache)
- goto skip;
+ continue;
spin_lock(&cache->lock);
cache->to_copy = 1;
spin_unlock(&cache->lock);
btrfs_put_block_group(cache);
-
-skip:
- ret = btrfs_next_item(root, path);
- if (ret != 0) {
- if (ret > 0)
- ret = 0;
- break;
- }
}
-free_path:
+ /* Reset error if the key wasn't found. */
+ if (ret > 0)
+ ret = 0;
+
btrfs_free_path(path);
unlock:
mutex_unlock(&fs_info->chunk_mutex);
--
2.31.1
next prev parent reply other threads:[~2021-08-26 16:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 16:40 [PATCHv2 0/8] btrfs: Create macro to iterate slots Marcos Paulo de Souza
2021-08-26 16:40 ` [PATCH 1/8] fs: btrfs: Introduce btrfs_for_each_slot Marcos Paulo de Souza
2021-08-30 12:37 ` Nikolay Borisov
2021-08-31 11:03 ` David Sterba
2021-08-31 11:06 ` David Sterba
2021-08-26 16:40 ` [PATCH 2/8] btrfs: block-group: use btrfs_for_each_slot in find_first_block_group Marcos Paulo de Souza
2021-08-26 16:40 ` Marcos Paulo de Souza [this message]
2021-08-26 16:40 ` [PATCH 4/8] btrfs: dir-item: use btrfs_for_each_slot in btrfs_search_dir_index_item Marcos Paulo de Souza
2021-08-26 16:40 ` [PATCH 5/8] btrfs: inode: use btrfs_for_each_slot in btrfs_read_readdir Marcos Paulo de Souza
2021-08-30 13:05 ` Nikolay Borisov
2021-08-31 11:10 ` David Sterba
2021-08-31 11:27 ` Nikolay Borisov
2021-08-26 16:40 ` [PATCH 6/8] btrfs: send: Use btrfs_for_each_slot macro Marcos Paulo de Souza
2021-08-30 13:53 ` Nikolay Borisov
2021-08-26 16:40 ` [PATCH 7/8] btrfs: volumes: use btrfs_for_each_slot in btrfs_read_chunk_tree Marcos Paulo de Souza
2021-08-26 16:40 ` [PATCH 8/8] btrfs: xattr: Use btrfs_for_each_slot macro in btrfs_listxattr Marcos Paulo de Souza
2021-08-26 18:06 ` [PATCHv2 0/8] btrfs: Create macro to iterate slots Marcos Paulo de Souza
2021-08-31 11:17 ` 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=20210826164054.14993-4-mpdesouza@suse.com \
--to=mpdesouza@suse.com \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).