]> git.sesse.net Git - bcachefs-tools-debian/commitdiff
Update bcachefs sources to eabde7cb37 fixup! bcachefs: Optimize bch2_alloc_to_v4()
authorKent Overstreet <kent.overstreet@linux.dev>
Wed, 30 Nov 2022 15:41:00 +0000 (10:41 -0500)
committerKent Overstreet <kent.overstreet@linux.dev>
Wed, 30 Nov 2022 15:41:00 +0000 (10:41 -0500)
.bcachefs_revision
libbcachefs/lru.c

index 2351d0c7954dbcd874550d36e43119635030d11d..1409d344c0bb0268c70d6d497c7aaf765469ba22 100644 (file)
@@ -1 +1 @@
-8a65cc495143fa43fb3c100de3c2b14519d3135f
+eabde7cb370040434991209cc3644c45079900da
index e16686b3b45aa00d018c068de1bb30a84b92ec43..380b66c7284fb0d7d3e91a6d1587a3c9f0544515 100644 (file)
@@ -134,7 +134,8 @@ static int bch2_check_lru_key(struct btree_trans *trans,
        struct bch_fs *c = trans->c;
        struct btree_iter iter;
        struct bkey_s_c k;
-       struct bch_alloc_v4 a;
+       struct bch_alloc_v4 a_convert;
+       const struct bch_alloc_v4 *a;
        struct printbuf buf1 = PRINTBUF;
        struct printbuf buf2 = PRINTBUF;
        struct bpos alloc_pos;
@@ -154,10 +155,10 @@ static int bch2_check_lru_key(struct btree_trans *trans,
        if (ret)
                goto err;
 
-       bch2_alloc_to_v4(k, &a);
+       a = bch2_alloc_to_v4(k, &a_convert);
 
-       if (fsck_err_on(a.data_type != BCH_DATA_cached ||
-                       a.io_time[READ] != lru_k.k->p.offset, c,
+       if (fsck_err_on(a->data_type != BCH_DATA_cached ||
+                       a->io_time[READ] != lru_k.k->p.offset, c,
                        "incorrect lru entry %s\n"
                        "  for %s",
                        (bch2_bkey_val_to_text(&buf1, c, lru_k), buf1.buf),