1 files changed, 6 insertions, 2 deletions

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index c274a752c93d..6932686b61cf 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -2758,7 +2758,7 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,
         int level;
         int lowest_unlock = 1;
         u8 lowest_level = 0;
-        int prev_cmp;
+        int prev_cmp = -1;
 
         lowest_level = p->lowest_level;
         WARN_ON(p->nodes[0] != NULL);
@@ -2769,7 +2769,6 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,
         }
 
 again:
-        prev_cmp = -1;
         b = get_old_root(root, time_seq);
         level = btrfs_header_level(b);
         p->locks[level] = BTRFS_READ_LOCK;
@@ -2787,6 +2786,11 @@ again:
                  */
                 btrfs_unlock_up_safe(p, level + 1);
 
+                /*
+                 * Since we can unwind eb's we want to do a real search every
+                 * time.
+                 */
+                prev_cmp = -1;
                 ret = key_search(b, key, level, &prev_cmp, &slot);
 
                 if (level != 0) {