From f39f0bde7875aceb3e82a330f3a86223c6dd8af4 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Thu, 7 Jan 2021 19:49:15 -0500 Subject: Update bcachefs sources to fcf8a0889c bcachefs: bch2_alloc_write() should be writing for all devices --- libbcachefs/alloc_types.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'libbcachefs/alloc_types.h') diff --git a/libbcachefs/alloc_types.h b/libbcachefs/alloc_types.h index 20705460..1abfff52 100644 --- a/libbcachefs/alloc_types.h +++ b/libbcachefs/alloc_types.h @@ -34,14 +34,12 @@ struct bucket_clock { struct mutex lock; }; -/* There is one reserve for each type of btree, one for prios and gens - * and one for moving GC */ enum alloc_reserve { - RESERVE_ALLOC = -1, - RESERVE_BTREE = 0, - RESERVE_MOVINGGC = 1, - RESERVE_NONE = 2, - RESERVE_NR = 3, + RESERVE_BTREE_MOVINGGC = -2, + RESERVE_BTREE = -1, + RESERVE_MOVINGGC = 0, + RESERVE_NONE = 1, + RESERVE_NR = 2, }; typedef FIFO(long) alloc_fifo; @@ -89,7 +87,6 @@ struct write_point { u64 last_used; unsigned long write_point; enum bch_data_type type; - bool is_ec; /* calculated based on how many pointers we're actually going to use: */ unsigned sectors_free; -- cgit v1.2.3