1 files changed, 3 insertions, 1 deletions

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index c6bfa86e2f22..678154d4b78f 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2352,8 +2352,10 @@ again:
                         nritems = btrfs_header_nritems(path->nodes[0]);
                         if (path->slots[0] >= nritems) {
                                 ret = btrfs_next_leaf(root, path);
-                                if (ret)
+                                if (ret == 1)
                                         break;
+                                else if (ret < 0)
+                                        goto out;
                         }
                         btrfs_item_key_to_cpu(path->nodes[0], &found_key,
                                               path->slots[0]);