diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-04-29 19:33:09 -0400 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:00 -0400 |
commit | bcb79a51cb52033bb12c5ed2eb46770e984b5542 (patch) | |
tree | 9474d9d274906a44a8a49fba8cd4bb74144e6c64 /fs/bcachefs/movinggc.c | |
parent | 174f930b8e1cad3915819a46bb20da214f68f2b5 (diff) | |
download | linux-bcb79a51cb52033bb12c5ed2eb46770e984b5542.tar.gz linux-bcb79a51cb52033bb12c5ed2eb46770e984b5542.tar.bz2 linux-bcb79a51cb52033bb12c5ed2eb46770e984b5542.zip |
bcachefs: bch2_bkey_get_iter() helpers
Introduce new helpers for a common pattern:
bch2_trans_iter_init();
bch2_btree_iter_peek_slot();
- bch2_bkey_get_iter_type() returns -ENOENT if it doesn't find a key of
the correct type
- bch2_bkey_get_val_typed() copies the val out of the btree to a
(typically stack allocated) variable; it handles the case where the
value in the btree is smaller than the current version of the type,
zeroing out the remainder.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/movinggc.c')
-rw-r--r-- | fs/bcachefs/movinggc.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/fs/bcachefs/movinggc.c b/fs/bcachefs/movinggc.c index bd5d5221788a..0d96346d5040 100644 --- a/fs/bcachefs/movinggc.c +++ b/fs/bcachefs/movinggc.c @@ -91,12 +91,9 @@ static int bch2_bucket_is_movable(struct btree_trans *trans, b->k.bucket.offset)) return 0; - bch2_trans_iter_init(trans, &iter, BTREE_ID_alloc, - b->k.bucket, BTREE_ITER_CACHED); - k = bch2_btree_iter_peek_slot(&iter); + k = bch2_bkey_get_iter(trans, &iter, BTREE_ID_alloc, + b->k.bucket, BTREE_ITER_CACHED); ret = bkey_err(k); - bch2_trans_iter_exit(trans, &iter); - if (ret) return ret; @@ -108,14 +105,7 @@ static int bch2_bucket_is_movable(struct btree_trans *trans, a->fragmentation_lru && a->fragmentation_lru <= time; - if (!ret) { - struct printbuf buf = PRINTBUF; - - bch2_bkey_val_to_text(&buf, trans->c, k); - pr_debug("%s", buf.buf); - printbuf_exit(&buf); - } - + bch2_trans_iter_exit(trans, &iter); return ret; } |