diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-11-30 10:41:00 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-11-30 10:41:00 -0500 |
| commit | 0c98cd7bf6617468f08b2d01a4313c0f1b7f0f03 (patch) | |
| tree | 789ea46635d7877e4e6b0c2d22e1745d5bd61648 | |
| parent | 5a5a6c25a93e83e0b1e659d7808e7636d0b770ed (diff) | |
Update bcachefs sources to eabde7cb37 fixup! bcachefs: Optimize bch2_alloc_to_v4()
| -rw-r--r-- | .bcachefs_revision | 2 | ||||
| -rw-r--r-- | libbcachefs/lru.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision index 2351d0c7..1409d344 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -8a65cc495143fa43fb3c100de3c2b14519d3135f +eabde7cb370040434991209cc3644c45079900da diff --git a/libbcachefs/lru.c b/libbcachefs/lru.c index e16686b3..380b66c7 100644 --- a/libbcachefs/lru.c +++ b/libbcachefs/lru.c @@ -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), |