Update bcachefs sources to 05ef7000f2 bcachefs: Switch reconstruct_alloc to a mount...

diff --git a/.bcachefs_revision b/.bcachefs_revision
index 97cf88b455d01fcb21a1ac0ce8516da38a408927..327751865172062798d530d498af471b6a81fd26 100644 (file)
--- a/.bcachefs_revision
+++ b/.bcachefs_revision
@@ -1 +1 @@
-bfb7133d71638b39411352729427c1bb14ca0b6e
+05ef7000f242c003918c8675a0b33670117057ed

diff --git a/libbcachefs/bcachefs.h b/libbcachefs/bcachefs.h
index ac797854e140690f07bcda1e309c62f6a922fca8..a186aa5210490143240840639b4ee33764868f55 100644 (file)
--- a/libbcachefs/bcachefs.h
+++ b/libbcachefs/bcachefs.h
@@ -283,9 +283,7 @@ do {                                                                        \
                "Force reads to use the reconstruct path, when reading" \
                "from erasure coded extents")                           \
        BCH_DEBUG_PARAM(test_restart_gc,                                \
-               "Test restarting mark and sweep gc when bucket gens change")\
-       BCH_DEBUG_PARAM(test_reconstruct_alloc,                         \
-               "Test reconstructing the alloc btree")
+               "Test restarting mark and sweep gc when bucket gens change")
 
 #define BCH_DEBUG_PARAMS_ALL() BCH_DEBUG_PARAMS_ALWAYS() BCH_DEBUG_PARAMS_DEBUG()
 

diff --git a/libbcachefs/buckets.c b/libbcachefs/buckets.c
index 16559e8909c6f10b10563dbdaad2da8cbbf43da1..bffb247d201aaaea472d2f05db5499864750cd95 100644 (file)
--- a/libbcachefs/buckets.c
+++ b/libbcachefs/buckets.c
@@ -521,7 +521,6 @@ static inline void update_replicas(struct bch_fs *c,
        int idx = bch2_replicas_entry_idx(c, r);
 
        BUG_ON(idx < 0);
-       BUG_ON(!sectors);
 
        switch (r->data_type) {
        case BCH_DATA_BTREE:
@@ -570,8 +569,12 @@ static inline void update_replicas_list(struct btree_trans *trans,
 {
        struct replicas_delta_list *d;
        struct replicas_delta *n;
-       unsigned b = replicas_entry_bytes(r) + 8;
+       unsigned b;
+
+       if (!sectors)
+               return;
 
+       b = replicas_entry_bytes(r) + 8;
        d = replicas_deltas_realloc(trans, b);
 
        n = (void *) d->d + d->used;
@@ -1029,7 +1032,7 @@ static int bch2_mark_extent(struct bch_fs *c, struct bkey_s_c k,
                                        fs_usage, journal_seq, flags);
 
                if (p.ptr.cached) {
-                       if (disk_sectors && !stale)
+                       if (!stale)
                                update_cached_sectors(c, fs_usage, p.ptr.dev,
                                                      disk_sectors);
                } else if (!p.ec_nr) {
@@ -1048,8 +1051,7 @@ static int bch2_mark_extent(struct bch_fs *c, struct bkey_s_c k,
                }
        }
 
-       if (dirty_sectors)
-               update_replicas(c, fs_usage, &r.e, dirty_sectors);
+       update_replicas(c, fs_usage, &r.e, dirty_sectors);
 
        return 0;
 }
@@ -1413,6 +1415,7 @@ static int bch2_trans_mark_pointer(struct btree_trans *trans,
        struct bkey_s_c k;
        struct bkey_alloc_unpacked u;
        struct bkey_i_alloc *a;
+       unsigned old;
        bool overflow;
        int ret;
 
@@ -1441,9 +1444,9 @@ static int bch2_trans_mark_pointer(struct btree_trans *trans,
                 * Unless we're already updating that key:
                 */
                if (k.k->type != KEY_TYPE_alloc) {
-                       bch_err_ratelimited(c, "pointer to nonexistent bucket %u:%zu",
-                                           p.ptr.dev,
-                                           PTR_BUCKET_NR(ca, &p.ptr));
+                       bch_err_ratelimited(c, "pointer to nonexistent bucket %llu:%llu",
+                                           iter->pos.inode,
+                                           iter->pos.offset);
                        ret = -1;
                        goto out;
                }
@@ -1456,19 +1459,20 @@ static int bch2_trans_mark_pointer(struct btree_trans *trans,
                goto out;
        }
 
-       if (!p.ptr.cached)
+       if (!p.ptr.cached) {
+               old = u.dirty_sectors;
                overflow = checked_add(u.dirty_sectors, sectors);
-       else
+       } else {
+               old = u.cached_sectors;
                overflow = checked_add(u.cached_sectors, sectors);
+       }
 
        u.data_type = u.dirty_sectors || u.cached_sectors
                ? data_type : 0;
 
        bch2_fs_inconsistent_on(overflow, c,
                "bucket sector count overflow: %u + %lli > U16_MAX",
-               !p.ptr.cached
-               ? u.dirty_sectors
-               : u.cached_sectors, sectors);
+               old, sectors);
 
        a = trans_update_key(trans, iter, BKEY_ALLOC_U64s_MAX);
        ret = PTR_ERR_OR_ZERO(a);
@@ -1561,12 +1565,6 @@ static int bch2_trans_mark_extent(struct btree_trans *trans,
                        ? sectors
                        : ptr_disk_sectors_delta(p, offset, sectors, flags);
 
-               /*
-                * can happen due to rounding with compressed extents:
-                */
-               if (!disk_sectors)
-                       continue;
-
                ret = bch2_trans_mark_pointer(trans, p, disk_sectors,
                                              data_type);
                if (ret < 0)
@@ -1575,7 +1573,7 @@ static int bch2_trans_mark_extent(struct btree_trans *trans,
                stale = ret > 0;
 
                if (p.ptr.cached) {
-                       if (disk_sectors && !stale)
+                       if (!stale)
                                update_cached_sectors_list(trans, p.ptr.dev,
                                                           disk_sectors);
                } else if (!p.ec_nr) {
@@ -1593,8 +1591,7 @@ static int bch2_trans_mark_extent(struct btree_trans *trans,
                }
        }
 
-       if (dirty_sectors)
-               update_replicas_list(trans, &r.e, dirty_sectors);
+       update_replicas_list(trans, &r.e, dirty_sectors);
 
        return 0;
 }

diff --git a/libbcachefs/fs.c b/libbcachefs/fs.c
index f9ee4ac267534e9651000410148258601d6d4477..16017079157f3f7d79551709689dd0717af50e40 100644 (file)
--- a/libbcachefs/fs.c
+++ b/libbcachefs/fs.c
@@ -1166,7 +1166,8 @@ retry:
                                           offset_into_extent),
                                       &cur.k);
                bch2_key_resize(&cur.k.k, sectors);
-               cur.k.k.p.offset = iter->pos.offset + cur.k.k.size;
+               cur.k.k.p = iter->pos;
+               cur.k.k.p.offset += cur.k.k.size;
 
                if (have_extent) {
                        ret = bch2_fill_extent(c, info,

diff --git a/libbcachefs/opts.h b/libbcachefs/opts.h
index c6ec9f7effe574d25a6c85a572b470839a59d4a8..97a782f44f6e54b61d5669a69a51d054e6b3f0b8 100644 (file)
--- a/libbcachefs/opts.h
+++ b/libbcachefs/opts.h
@@ -258,6 +258,11 @@ enum opt_type {
          OPT_BOOL(),                                                   \
          NO_SB_OPT,                    false,                          \
          NULL,         "Don\'t start filesystem, only open devices")   \
+       x(reconstruct_alloc,            u8,                             \
+         OPT_MOUNT,                                                    \
+         OPT_BOOL(),                                                   \
+         NO_SB_OPT,                    false,                          \
+         NULL,         "Reconstruct alloc btree")                      \
        x(version_upgrade,              u8,                             \
          OPT_MOUNT,                                                    \
          OPT_BOOL(),                                                   \

diff --git a/libbcachefs/recovery.c b/libbcachefs/recovery.c
index f2899ba9ad43822e33d58aa7e4c5088b849db823..c9558ccb9a262001f3c0118c7fecdccbf7c5d619 100644 (file)
--- a/libbcachefs/recovery.c
+++ b/libbcachefs/recovery.c
@@ -249,7 +249,13 @@ static int bch2_extent_replay_key(struct bch_fs *c, enum btree_id btree_id,
                bch2_disk_reservation_init(c, 0);
        struct bkey_i *split;
        struct bpos atomic_end;
-       bool split_compressed = false;
+       /*
+        * Some extents aren't equivalent - w.r.t. what the triggers do
+        * - if they're split:
+        */
+       bool remark_if_split = bch2_extent_is_compressed(bkey_i_to_s_c(k)) ||
+               k->k.type == KEY_TYPE_reflink_p;
+       bool remark = false;
        int ret;
 
        bch2_trans_init(&trans, c, BTREE_ITER_MAX, 0);
@@ -280,8 +286,8 @@ retry:
                if (ret)
                        goto err;
 
-               if (!split_compressed &&
-                   bch2_extent_is_compressed(bkey_i_to_s_c(k)) &&
+               if (!remark &&
+                   remark_if_split &&
                    bkey_cmp(atomic_end, k->k.p) < 0) {
                        ret = bch2_disk_reservation_add(c, &disk_res,
                                        k->k.size *
@@ -289,7 +295,7 @@ retry:
                                        BCH_DISK_RESERVATION_NOFAIL);
                        BUG_ON(ret);
 
-                       split_compressed = true;
+                       remark = true;
                }
 
                bkey_copy(split, k);
@@ -300,7 +306,7 @@ retry:
                bch2_btree_iter_set_pos(iter, split->k.p);
        } while (bkey_cmp(iter->pos, k->k.p) < 0);
 
-       if (split_compressed) {
+       if (remark) {
                ret = bch2_trans_mark_key(&trans, bkey_i_to_s_c(k),
                                          0, -((s64) k->k.size),
                                          BCH_BUCKET_MARK_OVERWRITE) ?:
@@ -653,7 +659,7 @@ static int read_btree_roots(struct bch_fs *c)
                        continue;
 
                if (i == BTREE_ID_ALLOC &&
-                   test_reconstruct_alloc(c)) {
+                   c->opts.reconstruct_alloc) {
                        c->sb.compat &= ~(1ULL << BCH_COMPAT_FEAT_ALLOC_INFO);
                        continue;
                }

diff --git a/libbcachefs/replicas.c b/libbcachefs/replicas.c
index f84de35cee2bb9c8f2ca939bc1886c98f7d9e528..d06027256e0bc998834390659ec7e24698f6665a 100644 (file)
--- a/libbcachefs/replicas.c
+++ b/libbcachefs/replicas.c
@@ -80,7 +80,7 @@ static void extent_to_replicas(struct bkey_s_c k,
                        continue;
 
                if (p.ec_nr) {
-                       r->nr_devs = 0;
+                       r->nr_required = 0;
                        break;
                }