Update bcachefs sources to 84505cfd37 bcachefs: Go RW before check_alloc_info()

[bcachefs-tools-debian] / libbcachefs / btree_gc.c

diff --git a/libbcachefs/btree_gc.c b/libbcachefs/btree_gc.c
index 055987a2a6a6a06804f06950084deb0901622674..6b7353c9206eef54210018e88be39729ce888a25 100644 (file)
--- a/libbcachefs/btree_gc.c
+++ b/libbcachefs/btree_gc.c
@@ -1285,8 +1285,7 @@ fsck_err:
        return ret;
 }
 
-static int bch2_gc_start(struct bch_fs *c,
-                        bool metadata_only)
+static int bch2_gc_start(struct bch_fs *c)
 {
        struct bch_dev *ca = NULL;
        unsigned i;
@@ -1301,7 +1300,6 @@ static int bch2_gc_start(struct bch_fs *c,
        }
 
        for_each_member_device(ca, c, i) {
-               BUG_ON(ca->buckets_gc);
                BUG_ON(ca->usage_gc);
 
                ca->usage_gc = alloc_percpu(struct bch_dev_usage);
@@ -1318,6 +1316,22 @@ static int bch2_gc_start(struct bch_fs *c,
        return 0;
 }
 
+static int bch2_gc_reset(struct bch_fs *c)
+{
+       struct bch_dev *ca;
+       unsigned i;
+
+       for_each_member_device(ca, c, i) {
+               free_percpu(ca->usage_gc);
+               ca->usage_gc = NULL;
+       }
+
+       free_percpu(c->usage_gc);
+       c->usage_gc = NULL;
+
+       return bch2_gc_start(c);
+}
+
 /* returns true if not equal */
 static inline bool bch2_alloc_v4_cmp(struct bch_alloc_v4 l,
                                     struct bch_alloc_v4 r)
@@ -1763,7 +1777,7 @@ int bch2_gc(struct bch_fs *c, bool initial, bool metadata_only)
 
        bch2_btree_interior_updates_flush(c);
 
-       ret   = bch2_gc_start(c, metadata_only) ?:
+       ret   = bch2_gc_start(c) ?:
                bch2_gc_alloc_start(c, metadata_only) ?:
                bch2_gc_reflink_start(c, metadata_only);
        if (ret)
@@ -1824,6 +1838,9 @@ again:
                bch2_gc_stripes_reset(c, metadata_only);
                bch2_gc_alloc_reset(c, metadata_only);
                bch2_gc_reflink_reset(c, metadata_only);
+               ret = bch2_gc_reset(c);
+               if (ret)
+                       goto out;
 
                /* flush fsck errors, reset counters */
                bch2_flush_fsck_errs(c);
@@ -1975,7 +1992,7 @@ int bch2_gc_gens(struct bch_fs *c)
                                        NULL, NULL,
                                        BTREE_INSERT_NOFAIL,
                                gc_btree_gens_key(&trans, &iter, k));
-                       if (ret && ret != -EROFS)
+                       if (ret && !bch2_err_matches(ret, EROFS))
                                bch_err(c, "error recalculating oldest_gen: %s", bch2_err_str(ret));
                        if (ret)
                                goto err;
@@ -1988,7 +2005,7 @@ int bch2_gc_gens(struct bch_fs *c)
                        NULL, NULL,
                        BTREE_INSERT_NOFAIL,
                bch2_alloc_write_oldest_gen(&trans, &iter, k));
-       if (ret && ret != -EROFS)
+       if (ret && !bch2_err_matches(ret, EROFS))
                bch_err(c, "error writing oldest_gen: %s", bch2_err_str(ret));
        if (ret)
                goto err;