From 5f87f3c116f67fe22ba8a9f461830480a716fe9b Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Tue, 20 Jul 2021 20:14:44 -0400 Subject: [PATCH] bcachefs: Don't downgrade in traverse() Downgrading of btree iterators is something that should only happen explicitly. Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_key_cache.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c index d60b6084fdf08..d89cfab4df81f 100644 --- a/fs/bcachefs/btree_key_cache.c +++ b/fs/bcachefs/btree_key_cache.c @@ -341,12 +341,10 @@ fill: iter->uptodate = BTREE_ITER_NEED_PEEK; - if (!(iter->flags & BTREE_ITER_INTENT)) - bch2_btree_iter_downgrade(iter); - else if (!iter->locks_want) { - if (!__bch2_btree_iter_upgrade(iter, 1)) - ret = -EINTR; - } + if ((iter->flags & BTREE_ITER_INTENT) && + !iter->locks_want && + __bch2_btree_iter_upgrade(iter, 1)) + ret = -EINTR; return ret; err: -- 2.30.2