diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-04-26 16:34:57 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-05-02 00:41:47 -0400 |
| commit | 6b1f79d5df9f2735192ed1a40c711cf131d4f43e (patch) | |
| tree | 67f007fabd01964145cac4f273902f1c12927e8b /libbcachefs/alloc_foreground.c | |
| parent | c1a8e27a3fad202750a1b66a1fd1fa82a8a5bd92 (diff) | |
Update bcachefs sources to 6a20aede29 bcachefs: Fix quotas + snapshotsv0.29
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'libbcachefs/alloc_foreground.c')
| -rw-r--r-- | libbcachefs/alloc_foreground.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libbcachefs/alloc_foreground.c b/libbcachefs/alloc_foreground.c index 350635f3..ec77601e 100644 --- a/libbcachefs/alloc_foreground.c +++ b/libbcachefs/alloc_foreground.c @@ -29,11 +29,11 @@ #include "journal.h" #include "movinggc.h" #include "nocow_locking.h" +#include "trace.h" #include <linux/math64.h> #include <linux/rculist.h> #include <linux/rcupdate.h> -#include <trace/events/bcachefs.h> const char * const bch2_alloc_reserves[] = { #define x(t) #t, @@ -303,8 +303,9 @@ static struct open_bucket *try_alloc_bucket(struct btree_trans *trans, struct bc goto err; } - bch2_trans_iter_init(trans, &iter, BTREE_ID_alloc, POS(ca->dev_idx, b), BTREE_ITER_CACHED); - k = bch2_btree_iter_peek_slot(&iter); + k = bch2_bkey_get_iter(trans, &iter, + BTREE_ID_alloc, POS(ca->dev_idx, b), + BTREE_ITER_CACHED); ret = bkey_err(k); if (ret) { ob = ERR_PTR(ret); |