From 33c91e2ff4e228cb618ca22d642a34ec1c2cf0ef Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Thu, 11 Jul 2019 12:46:42 -0400 Subject: [PATCH] Update bcachefs sources to 44dc1f2695 bcachefs: Fix stripe_idx_to_delete() --- .bcachefs_revision | 2 +- libbcachefs/ec.c | 3 ++- libbcachefs/super.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.bcachefs_revision b/.bcachefs_revision index 5aeecbcd..b77e99a4 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -b91a514413ecdd15e0f9d8290761d24663a93425 +44dc1f269553f33cce43628444970efb85a7e802 diff --git a/libbcachefs/ec.c b/libbcachefs/ec.c index 6916fea5..aa67af8b 100644 --- a/libbcachefs/ec.c +++ b/libbcachefs/ec.c @@ -575,7 +575,8 @@ static ssize_t stripe_idx_to_delete(struct bch_fs *c) { ec_stripes_heap *h = &c->ec_stripes_heap; - return h->data[0].blocks_nonempty == 0 ? h->data[0].idx : -1; + return h->used && h->data[0].blocks_nonempty == 0 + ? h->data[0].idx : -1; } static inline int ec_stripes_heap_cmp(ec_stripes_heap *h, diff --git a/libbcachefs/super.c b/libbcachefs/super.c index b1b274a8..bd4b3188 100644 --- a/libbcachefs/super.c +++ b/libbcachefs/super.c @@ -309,6 +309,7 @@ void bch2_fs_read_only(struct bch_fs *c) */ percpu_ref_kill(&c->writes); + cancel_work_sync(&c->ec_stripe_delete_work); cancel_delayed_work(&c->pd_controllers_update); /*