1 files changed, 10 insertions, 2 deletions

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 10c18a6582cc..3ca313b138ca 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -935,12 +935,14 @@ static int find_new_extents(struct btrfs_root *root,
         min_key.type = BTRFS_EXTENT_DATA_KEY;
         min_key.offset = *off;
 
-        path->keep_locks = 1;
-
         while (1) {
+                path->keep_locks = 1;
                 ret = btrfs_search_forward(root, &min_key, path, newer_than);
                 if (ret != 0)
                         goto none;
+                path->keep_locks = 0;
+                btrfs_unlock_up_safe(path, 1);
+process_slot:
                 if (min_key.objectid != ino)
                         goto none;
                 if (min_key.type != BTRFS_EXTENT_DATA_KEY)
@@ -959,6 +961,12 @@ static int find_new_extents(struct btrfs_root *root,
                         return 0;
                 }
 
+                path->slots[0]++;
+                if (path->slots[0] < btrfs_header_nritems(leaf)) {
+                        btrfs_item_key_to_cpu(leaf, &min_key, path->slots[0]);
+                        goto process_slot;
+                }
+
                 if (min_key.offset == (u64)-1)
                         goto none;