Update bcachefs sources to 259ff91605 bcachefs: Don't keep around btree_paths unneces...

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

diff --git a/libbcachefs/extents.c b/libbcachefs/extents.c
index 89b5be907eeafbd13bd7cb2ea743ab33ca91110f..cc50e4b28882c703c5a80ab58e545e4e41aeeb40 100644 (file)
--- a/libbcachefs/extents.c
+++ b/libbcachefs/extents.c
@@ -303,7 +303,7 @@ bool bch2_extent_merge(struct bch_fs *c, struct bkey_s l, struct bkey_s_c r)
 
                        if (lp.crc.csum_type &&
                            lp.crc.uncompressed_size +
-                           rp.crc.uncompressed_size > c->sb.encoded_extent_max)
+                           rp.crc.uncompressed_size > (c->opts.encoded_extent_max >> 9))
                                return false;
 
                        if (lp.crc.uncompressed_size + rp.crc.uncompressed_size >
@@ -954,15 +954,19 @@ void bch2_bkey_ptrs_to_text(struct printbuf *out, struct bch_fs *c,
                switch (__extent_entry_type(entry)) {
                case BCH_EXTENT_ENTRY_ptr:
                        ptr = entry_to_ptr(entry);
-                       ca = ptr->dev < c->sb.nr_devices && c->devs[ptr->dev]
-                               ? bch_dev_bkey_exists(c, ptr->dev)
-                               : NULL;
 
-                       pr_buf(out, "ptr: %u:%llu gen %u%s%s", ptr->dev,
+                       pr_buf(out, "ptr: %u:%llu gen %u%s", ptr->dev,
                               (u64) ptr->offset, ptr->gen,
-                              ptr->cached ? " cached" : "",
-                              ca && ptr_stale(ca, ptr)
-                              ? " stale" : "");
+                              ptr->cached ? " cached" : "");
+
+                       if (c) {
+                               ca = ptr->dev < c->sb.nr_devices && c->devs[ptr->dev]
+                                       ? bch_dev_bkey_exists(c, ptr->dev)
+                                       : NULL;
+
+                               if (ca && ptr_stale(ca, ptr))
+                                       pr_buf(out, " stale");
+                       }
                        break;
                case BCH_EXTENT_ENTRY_crc32:
                case BCH_EXTENT_ENTRY_crc64:
@@ -1038,7 +1042,7 @@ const char *bch2_bkey_ptrs_invalid(const struct bch_fs *c, struct bkey_s_c k)
 
        if (k.k->type == KEY_TYPE_btree_ptr ||
            k.k->type == KEY_TYPE_btree_ptr_v2)
-               size_ondisk = c->opts.btree_node_size;
+               size_ondisk = btree_sectors(c);
 
        bkey_extent_entry_for_each(ptrs, entry) {
                if (__extent_entry_type(entry) >= BCH_EXTENT_ENTRY_MAX)