From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Fri, 12 Aug 2022 01:06:43 +0000 (-0400)
Subject: bcachefs: Fix assertion in bch2_btree_key_cache_drop()
X-Git-Tag: v6.7-rc1~201^2~836
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45b033fa1afd35a8eab0af003ffac9413548f476;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Fix assertion in bch2_btree_key_cache_drop()

Turns out this assertion was something we could legitimately hit - add a
comment describing what's going on, and handle it.

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
---

diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c
index f0055f17381d6..0e87c19effeb3 100644
--- a/fs/bcachefs/btree_key_cache.c
+++ b/fs/bcachefs/btree_key_cache.c
@@ -639,11 +639,22 @@ bool bch2_btree_insert_key_cached(struct btree_trans *trans,
 void bch2_btree_key_cache_drop(struct btree_trans *trans,
 			       struct btree_path *path)
 {
+	struct bch_fs *c = trans->c;
 	struct bkey_cached *ck = (void *) path->l[0].b;
 
-	ck->valid = false;
+	BUG_ON(!ck->valid);
 
-	BUG_ON(test_bit(BKEY_CACHED_DIRTY, &ck->flags));
+	/*
+	 * We just did an update to the btree, bypassing the key cache: the key
+	 * cache key is now stale and must be dropped, even if dirty:
+	 */
+	if (test_bit(BKEY_CACHED_DIRTY, &ck->flags)) {
+		clear_bit(BKEY_CACHED_DIRTY, &ck->flags);
+		atomic_long_dec(&c->btree_key_cache.nr_dirty);
+		bch2_journal_pin_drop(&c->journal, &ck->journal);
+	}
+
+	ck->valid = false;
 }
 
 static unsigned long bch2_btree_key_cache_scan(struct shrinker *shrink,