diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-21 02:10:28 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-21 02:13:02 -0400 |
| commit | 74148a8ee52526c44752f1773365963f18734ac9 (patch) | |
| tree | 25ccc19dab308fedcfb3fabdc955ecca2d2dc542 /libbcachefs/recovery.c | |
| parent | e76dbf1abd4472fa26c85f4b30e213d8768ccf64 (diff) | |
Update bcachefs sources to 0e705f5944 fixup! bcachefs: Refactor bch2_btree_node_mem_alloc()
Diffstat (limited to 'libbcachefs/recovery.c')
| -rw-r--r-- | libbcachefs/recovery.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libbcachefs/recovery.c b/libbcachefs/recovery.c index fe2c5cb6..66492dde 100644 --- a/libbcachefs/recovery.c +++ b/libbcachefs/recovery.c @@ -563,8 +563,9 @@ static int bch2_journal_replay(struct bch_fs *c) ret = bch2_trans_do(c, NULL, NULL, BTREE_INSERT_LAZY_RW| BTREE_INSERT_NOFAIL| - BTREE_INSERT_JOURNAL_RESERVED| - (!k->allocated ? BTREE_INSERT_JOURNAL_REPLAY : 0), + (!k->allocated + ? BTREE_INSERT_JOURNAL_REPLAY|JOURNAL_WATERMARK_reserved + : 0), bch2_journal_replay_key(&trans, k)); if (ret) { bch_err(c, "journal replay: error %d while replaying key at btree %s level %u", |