summaryrefslogtreecommitdiff
path: root/libbcachefs/move.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2023-12-22 21:21:14 -0500
committerKent Overstreet <kent.overstreet@linux.dev>2023-12-22 21:21:14 -0500
commit5134a64cebf9cbc57d76f9e69a8627227803a061 (patch)
treebf972b061fc8fa51b1dd828caebcdc8f93a3d55e /libbcachefs/move.c
parente962ffb76959b40016b8b26e366bcb30f4a40bdb (diff)
Update bcachefs sources to c6d45169c6 bcachefs: Convert split_devs() to darray
Diffstat (limited to 'libbcachefs/move.c')
-rw-r--r--libbcachefs/move.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libbcachefs/move.c b/libbcachefs/move.c
index 6cb38484..7a33319d 100644
--- a/libbcachefs/move.c
+++ b/libbcachefs/move.c
@@ -695,9 +695,6 @@ int bch2_evacuate_bucket(struct moving_context *ctxt,
break;
if (!bp.level) {
- const struct bch_extent_ptr *ptr;
- unsigned i = 0;
-
k = bch2_backpointer_get_key(trans, &iter, bp_pos, bp, 0);
ret = bkey_err(k);
if (bch2_err_matches(ret, BCH_ERR_transaction_restart))
@@ -720,6 +717,7 @@ int bch2_evacuate_bucket(struct moving_context *ctxt,
data_opts.target = io_opts.background_target;
data_opts.rewrite_ptrs = 0;
+ unsigned i = 0;
bkey_for_each_ptr(bch2_bkey_ptrs_c(k), ptr) {
if (ptr->dev == bucket.inode) {
data_opts.rewrite_ptrs |= 1U << i;
@@ -890,7 +888,6 @@ static bool migrate_pred(struct bch_fs *c, void *arg,
struct data_update_opts *data_opts)
{
struct bkey_ptrs_c ptrs = bch2_bkey_ptrs_c(k);
- const struct bch_extent_ptr *ptr;
struct bch_ioctl_data *op = arg;
unsigned i = 0;