bcachefs: skip journal more often in key cache reclaim

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c
index 7d2db1e5df3bff4f083025d6b08974e65a829a1c..a4e9e7ffad32860ee317435af34f47270097fd0a 100644 (file)
--- a/fs/bcachefs/btree_key_cache.c
+++ b/fs/bcachefs/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) ?: