summaryrefslogtreecommitdiffstats
path: root/fs/bcachefs/btree_locking.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2022-08-31 18:53:42 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-22 17:09:40 -0400
commit4e6defd106b69c3a78da380d694fd43275125dda (patch)
tree72954b81e8647c46cabcf259028fff99156e27f7 /fs/bcachefs/btree_locking.c
parent6b81f194f345d15dd15601ee7b604a0640445895 (diff)
downloadlinux-stable-4e6defd106b69c3a78da380d694fd43275125dda.tar.gz
linux-stable-4e6defd106b69c3a78da380d694fd43275125dda.tar.bz2
linux-stable-4e6defd106b69c3a78da380d694fd43275125dda.zip
bcachefs: btree_bkey_cached_common->cached
Add a type descriptor to btree_bkey_cached_common - there's no reason not to since we've got padding that was otherwise unused, and this is a nice cleanup (and helpful in later patches). Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_locking.c')
-rw-r--r--fs/bcachefs/btree_locking.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_locking.c b/fs/bcachefs/btree_locking.c
index 158cb7ac64f2..c73902c170d4 100644
--- a/fs/bcachefs/btree_locking.c
+++ b/fs/bcachefs/btree_locking.c
@@ -144,8 +144,7 @@ int __bch2_btree_node_lock(struct btree_trans *trans,
/* Must lock btree nodes in key order: */
if (btree_node_locked(linked, level) &&
- bpos_cmp(pos, btree_node_pos(&linked->l[level].b->c,
- linked->cached)) <= 0) {
+ bpos_cmp(pos, btree_node_pos(&linked->l[level].b->c)) <= 0) {
reason = 7;
goto deadlock;
}