bcachefs: Don't downgrade in traverse()

Downgrading of btree iterators is something that should only happen
explicitly.

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 d60b6084fdf088d9d21c3706f4668d71a0bb7f39..d89cfab4df81f58894dced9ca74e6ebffda10a88 100644 (file)
--- 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: