diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-10 22:29:14 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-04-10 22:29:14 -0400 |
| commit | 74b88aa9be95eb7477d1a6699bb9235bf5562ea6 (patch) | |
| tree | f6c5b676f8d9ff9ee77b11b4013f482c36cb791a | |
| parent | 2668cb95d993740de7a104fb20f3a13bbfd0da5c (diff) | |
Update bcachefs sources to 2d5e6ec144 fixup! bcachefs: Ensure buckets have io_time[READ] set
| -rw-r--r-- | .bcachefs_revision | 2 | ||||
| -rw-r--r-- | libbcachefs/btree_gc.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/.bcachefs_revision b/.bcachefs_revision index 7cbba1f..7ba5313 100644 --- a/.bcachefs_revision +++ b/.bcachefs_revision @@ -1 +1 @@ -202b20c48f6fa96de566d71b6e1a27e0de00d341 +2d5e6ec1447dcd1d56683914140750cef8811eb8 diff --git a/libbcachefs/btree_gc.c b/libbcachefs/btree_gc.c index b04f470..d027526 100644 --- a/libbcachefs/btree_gc.c +++ b/libbcachefs/btree_gc.c @@ -1408,6 +1408,13 @@ static int bch2_alloc_write_key(struct btree_trans *trans, a->v = new; + /* + * The trigger normally makes sure this is set, but we're not running + * triggers: + */ + if (a->v.data_type == BCH_DATA_cached && !a->v.io_time[READ]) + a->v.io_time[READ] = max_t(u64, 1, atomic64_read(&c->io_clock[READ].now)); + ret = bch2_trans_update(trans, iter, &a->k_i, BTREE_TRIGGER_NORUN); fsck_err: return ret; |