From cfa816bf3f823a3bedfedd8e214ea929c5c755fe Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 24 Jun 2023 12:50:52 -0400 Subject: Update bcachefs sources to 84f132d569 bcachefs: fsck: Break walk_inode() up into multiple functions Signed-off-by: Kent Overstreet --- libbcachefs/alloc_foreground.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libbcachefs/alloc_foreground.h') diff --git a/libbcachefs/alloc_foreground.h b/libbcachefs/alloc_foreground.h index 8a1cf425..fee195f7 100644 --- a/libbcachefs/alloc_foreground.h +++ b/libbcachefs/alloc_foreground.h @@ -14,7 +14,7 @@ struct bch_dev; struct bch_fs; struct bch_devs_List; -extern const char * const bch2_alloc_reserves[]; +extern const char * const bch2_watermarks[]; void bch2_reset_alloc_cursors(struct bch_fs *); @@ -31,7 +31,7 @@ void bch2_dev_stripe_increment(struct bch_dev *, struct dev_stripe_state *); long bch2_bucket_alloc_new_fs(struct bch_dev *); struct open_bucket *bch2_bucket_alloc(struct bch_fs *, struct bch_dev *, - enum alloc_reserve, struct closure *); + enum bch_watermark, struct closure *); static inline void ob_push(struct bch_fs *c, struct open_buckets *obs, struct open_bucket *ob) @@ -152,7 +152,7 @@ static inline bool bch2_bucket_is_open_safe(struct bch_fs *c, unsigned dev, u64 int bch2_bucket_alloc_set_trans(struct btree_trans *, struct open_buckets *, struct dev_stripe_state *, struct bch_devs_mask *, unsigned, unsigned *, bool *, unsigned, - enum bch_data_type, enum alloc_reserve, + enum bch_data_type, enum bch_watermark, struct closure *); int bch2_alloc_sectors_start_trans(struct btree_trans *, @@ -160,7 +160,7 @@ int bch2_alloc_sectors_start_trans(struct btree_trans *, struct write_point_specifier, struct bch_devs_list *, unsigned, unsigned, - enum alloc_reserve, + enum bch_watermark, unsigned, struct closure *, struct write_point **); -- cgit v1.2.3