Update bcachefs sources to 44dc1f2695 bcachefs: Fix stripe_idx_to_delete()

diff --git a/.bcachefs_revision b/.bcachefs_revision
index 5aeecbcdcacfcc0c746fe0af6362d8984826aa81..b77e99a44b8100bcd9eb448dfa3b140533555efc 100644 (file)
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-b91a514413ecdd15e0f9d8290761d24663a93425
+44dc1f269553f33cce43628444970efb85a7e802

diff --git a/libbcachefs/ec.c b/libbcachefs/ec.c
index 6916fea532ace6dbc9dbd35694b5fd020777e993..aa67af8b98160b0571ebc2bbbec8985880924e6d 100644 (file)
--- 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 b1b274a8fc103be39d073938ccf3376296c6bb06..bd4b3188be5328be0a23cf2bcdcd2c8391981a71 100644 (file)
--- 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);
 
        /*