From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Wed, 21 Jul 2021 00:14:44 +0000 (-0400)
Subject: bcachefs: Don't downgrade in traverse()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5f87f3c116f67fe22ba8a9f461830480a716fe9b;p=linux.git

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 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: