summaryrefslogtreecommitdiff
path: root/libbcachefs/btree_key_cache.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2023-12-21 19:10:40 -0500
committerKent Overstreet <kent.overstreet@linux.dev>2023-12-21 19:10:40 -0500
commit93241a1c9a7dbef987f524a9dea3fc61e87e845b (patch)
treeaf89381c5c4c4938b03fe27b9d61e45e08f7432d /libbcachefs/btree_key_cache.c
parent2b97686ffa5f714a970ad88aa40cf47bdb998094 (diff)
Update bcachefs sources to 5d0a6c2b32f1 bcachefs: check_directory_structure() can now be run online
Diffstat (limited to 'libbcachefs/btree_key_cache.c')
-rw-r--r--libbcachefs/btree_key_cache.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libbcachefs/btree_key_cache.c b/libbcachefs/btree_key_cache.c
index 39fd4d8a..74e52fd2 100644
--- a/libbcachefs/btree_key_cache.c
+++ b/libbcachefs/btree_key_cache.c
@@ -655,7 +655,9 @@ static int btree_key_cache_flush_pos(struct btree_trans *trans,
*/
if (ck->journal.seq == journal_last_seq(j))
commit_flags |= BCH_WATERMARK_reclaim;
- else
+
+ if (ck->journal.seq != journal_last_seq(j) ||
+ j->watermark == BCH_WATERMARK_stripe)
commit_flags |= BCH_TRANS_COMMIT_no_journal_res;
ret = bch2_btree_iter_traverse(&b_iter) ?: