81 lines
2.8 KiB
Diff
81 lines
2.8 KiB
Diff
From bbc2ccccfd24a9da72cdcd9b26568883250ff7a4 Mon Sep 17 00:00:00 2001
|
|
From: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Date: Fri, 15 Nov 2024 16:30:30 -0500
|
|
Subject: [PATCH 104/233] bcachefs: bucket_pos_to_bp_end()
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Better helpers for iterating over backpointers within a specific bucket
|
|
|
|
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/backpointers.h | 10 ++++++++++
|
|
fs/bcachefs/ec.c | 5 +++--
|
|
fs/bcachefs/move.c | 5 ++---
|
|
3 files changed, 15 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/fs/bcachefs/backpointers.h b/fs/bcachefs/backpointers.h
|
|
index eda3a78a5e2b..595db7960939 100644
|
|
--- a/fs/bcachefs/backpointers.h
|
|
+++ b/fs/bcachefs/backpointers.h
|
|
@@ -80,6 +80,16 @@ static inline struct bpos bucket_pos_to_bp(const struct bch_dev *ca,
|
|
return ret;
|
|
}
|
|
|
|
+static inline struct bpos bucket_pos_to_bp_start(const struct bch_dev *ca, struct bpos bucket)
|
|
+{
|
|
+ return bucket_pos_to_bp(ca, bucket, 0);
|
|
+}
|
|
+
|
|
+static inline struct bpos bucket_pos_to_bp_end(const struct bch_dev *ca, struct bpos bucket)
|
|
+{
|
|
+ return bpos_nosnap_predecessor(bucket_pos_to_bp(ca, bpos_nosnap_successor(bucket), 0));
|
|
+}
|
|
+
|
|
int bch2_bucket_backpointer_mod_nowritebuffer(struct btree_trans *, struct bch_dev *,
|
|
struct bpos bucket, struct bch_backpointer, struct bkey_s_c, bool);
|
|
|
|
diff --git a/fs/bcachefs/ec.c b/fs/bcachefs/ec.c
|
|
index aa8ada4f0ec0..a4a2555d7c4f 100644
|
|
--- a/fs/bcachefs/ec.c
|
|
+++ b/fs/bcachefs/ec.c
|
|
@@ -1374,8 +1374,9 @@ static int ec_stripe_update_bucket(struct btree_trans *trans, struct ec_stripe_b
|
|
|
|
struct bpos bucket_pos = PTR_BUCKET_POS(ca, &ptr);
|
|
|
|
- ret = for_each_btree_key_commit(trans, bp_iter, BTREE_ID_backpointers,
|
|
- bucket_pos_to_bp(ca, bucket_pos, 0), 0, bp_k,
|
|
+ ret = for_each_btree_key_max_commit(trans, bp_iter, BTREE_ID_backpointers,
|
|
+ bucket_pos_to_bp_start(ca, bucket_pos),
|
|
+ bucket_pos_to_bp_end(ca, bucket_pos), 0, bp_k,
|
|
NULL, NULL,
|
|
BCH_TRANS_COMMIT_no_check_rw|
|
|
BCH_TRANS_COMMIT_no_enospc, ({
|
|
diff --git a/fs/bcachefs/move.c b/fs/bcachefs/move.c
|
|
index 74839268d6ab..460175464762 100644
|
|
--- a/fs/bcachefs/move.c
|
|
+++ b/fs/bcachefs/move.c
|
|
@@ -691,7 +691,7 @@ int bch2_evacuate_bucket(struct moving_context *ctxt,
|
|
bch2_trans_begin(trans);
|
|
|
|
bch2_trans_iter_init(trans, &bp_iter, BTREE_ID_backpointers,
|
|
- bucket_pos_to_bp(ca, bucket, 0), 0);
|
|
+ bucket_pos_to_bp_start(ca, bucket), 0);
|
|
|
|
bch_err_msg(c, ret, "looking up alloc key");
|
|
if (ret)
|
|
@@ -715,8 +715,7 @@ int bch2_evacuate_bucket(struct moving_context *ctxt,
|
|
if (ret)
|
|
goto err;
|
|
|
|
- if (!k.k ||
|
|
- bkey_ge(k.k->p, bucket_pos_to_bp(ca, bpos_nosnap_successor(bucket), 0)))
|
|
+ if (!k.k || bkey_gt(k.k->p, bucket_pos_to_bp_end(ca, bucket)))
|
|
break;
|
|
|
|
if (k.k->type != KEY_TYPE_backpointer)
|
|
--
|
|
2.45.2
|
|
|