diff options
| author | Brian Foster <bfoster@redhat.com> | 2023-05-01 09:08:26 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-05-12 19:42:33 -0400 |
| commit | 3f04312ae8570730c0ba702387d9f4c6ab21daa7 (patch) | |
| tree | 3d9a9dadf18a8077a1e267f41cbcbe6356560b23 | |
| parent | c335c304e13faf861f786f0c7aaebb031a5d4947 (diff) | |
bcachefs: remove unused key cache coherency flag
Signed-off-by: Brian Foster <bfoster@redhat.com>
| -rw-r--r-- | fs/bcachefs/bkey_methods.h | 3 | ||||
| -rw-r--r-- | fs/bcachefs/btree_update_leaf.c | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/fs/bcachefs/bkey_methods.h b/fs/bcachefs/bkey_methods.h index 6ae517884a37..346b3ceb136d 100644 --- a/fs/bcachefs/bkey_methods.h +++ b/fs/bcachefs/bkey_methods.h @@ -83,7 +83,6 @@ enum btree_update_flags { __BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE, __BTREE_UPDATE_NOJOURNAL, __BTREE_UPDATE_KEY_CACHE_RECLAIM, - __BTREE_UPDATE_NO_KEY_CACHE_COHERENCY, __BTREE_TRIGGER_NORUN, /* Don't run triggers at all */ @@ -98,8 +97,6 @@ enum btree_update_flags { #define BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE (1U << __BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE) #define BTREE_UPDATE_NOJOURNAL (1U << __BTREE_UPDATE_NOJOURNAL) #define BTREE_UPDATE_KEY_CACHE_RECLAIM (1U << __BTREE_UPDATE_KEY_CACHE_RECLAIM) -#define BTREE_UPDATE_NO_KEY_CACHE_COHERENCY \ - (1U << __BTREE_UPDATE_NO_KEY_CACHE_COHERENCY) #define BTREE_TRIGGER_NORUN (1U << __BTREE_TRIGGER_NORUN) diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index be4c5df42be8..c511541bb5f4 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -1606,9 +1606,7 @@ bch2_trans_update_by_path_trace(struct btree_trans *trans, struct btree_path *pa * the key cache - but the key has to exist in the btree for that to * work: */ - if (path->cached && - bkey_deleted(&i->old_k) && - !(flags & BTREE_UPDATE_NO_KEY_CACHE_COHERENCY)) + if (path->cached && bkey_deleted(&i->old_k)) return flush_new_cached_update(trans, path, i, flags, ip); return 0; |