summaryrefslogtreecommitdiff
path: root/libbcachefs/alloc_background.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2021-12-30 21:23:06 -0500
committerKent Overstreet <kent.overstreet@gmail.com>2022-01-01 21:14:28 -0500
commit12fe5797ad3e58a365442751aed58c776c09e69f (patch)
treec8ca2fb0a7c57942cf1e50e6948a7f00117d3fc5 /libbcachefs/alloc_background.c
parent617dc6dd68f9fc4a65334de6ad499be29fcdaba4 (diff)
Update bcachefs sources to 916d92b6b4 bcachefs: Add error messages for memory allocation failures
Diffstat (limited to 'libbcachefs/alloc_background.c')
-rw-r--r--libbcachefs/alloc_background.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libbcachefs/alloc_background.c b/libbcachefs/alloc_background.c
index 2a36af5e..eb2e6642 100644
--- a/libbcachefs/alloc_background.c
+++ b/libbcachefs/alloc_background.c
@@ -859,7 +859,8 @@ static void discard_one_bucket(struct bch_fs *c, struct bch_dev *ca, u64 b)
static bool allocator_thread_running(struct bch_dev *ca)
{
unsigned state = ca->mi.state == BCH_MEMBER_STATE_rw &&
- test_bit(BCH_FS_ALLOCATOR_RUNNING, &ca->fs->flags)
+ test_bit(BCH_FS_ALLOCATOR_RUNNING, &ca->fs->flags) &&
+ test_bit(BCH_FS_ALLOC_REPLAY_DONE, &ca->fs->flags)
? ALLOCATOR_running
: ALLOCATOR_stopped;
alloc_thread_set_state(ca, state);