67 lines
1.9 KiB
Diff
67 lines
1.9 KiB
Diff
From 52ee09e70b8a9a04eaad4d9df65a6fcfc5fad43c Mon Sep 17 00:00:00 2001
|
|
From: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Date: Thu, 12 Dec 2024 03:38:14 -0500
|
|
Subject: [PATCH 198/233] bcachefs: tidy up __bch2_btree_iter_peek()
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/btree_iter.c | 14 ++++++--------
|
|
1 file changed, 6 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
|
|
index 9c54891c737a..368ebcaf05fd 100644
|
|
--- a/fs/bcachefs/btree_iter.c
|
|
+++ b/fs/bcachefs/btree_iter.c
|
|
@@ -2260,7 +2260,7 @@ static struct bkey_s_c __bch2_btree_iter_peek(struct btree_iter *iter, struct bp
|
|
/* ensure that iter->k is consistent with iter->pos: */
|
|
bch2_btree_iter_set_pos(iter, iter->pos);
|
|
k = bkey_s_c_err(ret);
|
|
- goto out;
|
|
+ break;
|
|
}
|
|
|
|
struct btree_path *path = btree_iter_path(trans, iter);
|
|
@@ -2270,7 +2270,7 @@ static struct bkey_s_c __bch2_btree_iter_peek(struct btree_iter *iter, struct bp
|
|
/* No btree nodes at requested level: */
|
|
bch2_btree_iter_set_pos(iter, SPOS_MAX);
|
|
k = bkey_s_c_null;
|
|
- goto out;
|
|
+ break;
|
|
}
|
|
|
|
btree_path_set_should_be_locked(trans, path);
|
|
@@ -2281,10 +2281,9 @@ static struct bkey_s_c __bch2_btree_iter_peek(struct btree_iter *iter, struct bp
|
|
k.k &&
|
|
(k2 = btree_trans_peek_key_cache(iter, k.k->p)).k) {
|
|
k = k2;
|
|
- ret = bkey_err(k);
|
|
- if (ret) {
|
|
+ if (bkey_err(k)) {
|
|
bch2_btree_iter_set_pos(iter, iter->pos);
|
|
- goto out;
|
|
+ break;
|
|
}
|
|
}
|
|
|
|
@@ -2318,12 +2317,11 @@ static struct bkey_s_c __bch2_btree_iter_peek(struct btree_iter *iter, struct bp
|
|
/* End of btree: */
|
|
bch2_btree_iter_set_pos(iter, SPOS_MAX);
|
|
k = bkey_s_c_null;
|
|
- goto out;
|
|
+ break;
|
|
}
|
|
}
|
|
-out:
|
|
- bch2_btree_iter_verify(iter);
|
|
|
|
+ bch2_btree_iter_verify(iter);
|
|
return k;
|
|
}
|
|
|
|
--
|
|
2.45.2
|
|
|