1 files changed, 12 insertions, 7 deletions

diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 6a3f7f50ad37..835b6c9a26a8 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -1569,7 +1569,6 @@ static int iterate_inode_refs(u64 inum, struct btrfs_root *fs_root,
         struct btrfs_key found_key;
 
         while (!ret) {
-                path->leave_spinning = 1;
                 ret = inode_ref_info(inum, parent ? parent+1 : 0, fs_root, path,
                                      &found_key);
                 if (ret < 0)
@@ -1582,9 +1581,12 @@ static int iterate_inode_refs(u64 inum, struct btrfs_root *fs_root,
 
                 parent = found_key.offset;
                 slot = path->slots[0];
-                eb = path->nodes[0];
-                /* make sure we can use eb after releasing the path */
-                atomic_inc(&eb->refs);
+                eb = btrfs_clone_extent_buffer(path->nodes[0]);
+                if (!eb) {
+                        ret = -ENOMEM;
+                        break;
+                }
+                extent_buffer_get(eb);
                 btrfs_tree_read_lock(eb);
                 btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
                 btrfs_release_path(path);
@@ -1642,9 +1644,12 @@ static int iterate_inode_extrefs(u64 inum, struct btrfs_root *fs_root,
                 ++found;
 
                 slot = path->slots[0];
-                eb = path->nodes[0];
-                /* make sure we can use eb after releasing the path */
-                atomic_inc(&eb->refs);
+                eb = btrfs_clone_extent_buffer(path->nodes[0]);
+                if (!eb) {
+                        ret = -ENOMEM;
+                        break;
+                }
+                extent_buffer_get(eb);
 
                 btrfs_tree_read_lock(eb);
                 btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);