From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Sun, 22 Jul 2018 17:04:00 +0000 (-0400)
Subject: bcachefs: Fix an assertion
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8bb4dff72d07f4f46e5627870a9614c4cee5a1bb;p=linux.git

bcachefs: Fix an assertion

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c
index 7ce2e35dafa2a..3d0c6f5c98ada 100644
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -490,7 +490,7 @@ out:
 			bch2_btree_iter_verify_locks(linked);
 			BUG_ON((trans->flags & BTREE_INSERT_NOUNLOCK) &&
 			       trans->did_work &&
-			       linked->uptodate >= BTREE_ITER_NEED_RELOCK);
+			       !btree_node_locked(linked, 0));
 		}
 
 		/* make sure we didn't lose an error: */