1 files changed, 26 insertions, 17 deletions

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index c3992b7b0c60..e7510ac5559d 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -13,9 +13,11 @@ int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans,
         int ret = 0;
         struct btrfs_file_extent_item *item;
         struct btrfs_key file_key;
-        struct btrfs_path path;
+        struct btrfs_path *path;
 
-        btrfs_init_path(&path);
+        path = btrfs_alloc_path();
+        BUG_ON(!path);
+        btrfs_init_path(path);
         ret = btrfs_alloc_extent(trans, root, num_blocks, hint_block,
                                  (u64)-1, objectid, &ins);
         BUG_ON(ret);
@@ -24,19 +26,20 @@ int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans,
         file_key.flags = 0;
         btrfs_set_key_type(&file_key, BTRFS_EXTENT_DATA_KEY);
 
-        ret = btrfs_insert_empty_item(trans, root, &path, &file_key,
+        ret = btrfs_insert_empty_item(trans, root, path, &file_key,
                                       sizeof(*item));
         BUG_ON(ret);
-        item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0],
+        item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
                               struct btrfs_file_extent_item);
         btrfs_set_file_extent_disk_blocknr(item, ins.objectid);
         btrfs_set_file_extent_disk_num_blocks(item, ins.offset);
         btrfs_set_file_extent_offset(item, 0);
         btrfs_set_file_extent_num_blocks(item, ins.offset);
         btrfs_set_file_extent_generation(item, trans->transid);
-        btrfs_mark_buffer_dirty(path.nodes[0]);
+        btrfs_mark_buffer_dirty(path->nodes[0]);
         *result = ins.objectid;
-        btrfs_release_path(root, &path);
+        btrfs_release_path(root, path);
+        btrfs_free_path(path);
         return 0;
 }
 
@@ -65,25 +68,28 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
 {
         int ret;
         struct btrfs_key file_key;
-        struct btrfs_path path;
+        struct btrfs_path *path;
         struct btrfs_csum_item *item;
 
-        btrfs_init_path(&path);
+        path = btrfs_alloc_path();
+        BUG_ON(!path);
+        btrfs_init_path(path);
         file_key.objectid = objectid;
         file_key.offset = offset;
         file_key.flags = 0;
         btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY);
-        ret = btrfs_insert_empty_item(trans, root, &path, &file_key,
+        ret = btrfs_insert_empty_item(trans, root, path, &file_key,
                                       BTRFS_CSUM_SIZE);
         if (ret != 0 && ret != -EEXIST)
                 goto fail;
-        item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0],
+        item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
                               struct btrfs_csum_item);
         ret = 0;
         ret = btrfs_csum_data(root, data, len, item->csum);
-        btrfs_mark_buffer_dirty(path.nodes[0]);
+        btrfs_mark_buffer_dirty(path->nodes[0]);
 fail:
-        btrfs_release_path(root, &path);
+        btrfs_release_path(root, path);
+        btrfs_free_path(path);
         return ret;
 }
 
@@ -93,19 +99,21 @@ int btrfs_csum_verify_file_block(struct btrfs_root *root,
 {
         int ret;
         struct btrfs_key file_key;
-        struct btrfs_path path;
+        struct btrfs_path *path;
         struct btrfs_csum_item *item;
         char result[BTRFS_CSUM_SIZE];
 
-        btrfs_init_path(&path);
+        path = btrfs_alloc_path();
+        BUG_ON(!path);
+        btrfs_init_path(path);
         file_key.objectid = objectid;
         file_key.offset = offset;
         file_key.flags = 0;
         btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY);
-        ret = btrfs_search_slot(NULL, root, &file_key, &path, 0, 0);
+        ret = btrfs_search_slot(NULL, root, &file_key, path, 0, 0);
         if (ret)
                 goto fail;
-        item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]), path.slots[0],
+        item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
                               struct btrfs_csum_item);
         ret = 0;
         ret = btrfs_csum_data(root, data, len, result);
@@ -113,7 +121,8 @@ int btrfs_csum_verify_file_block(struct btrfs_root *root,
         if (memcmp(result, item->csum, BTRFS_CSUM_SIZE))
                 ret = 1;
 fail:
-        btrfs_release_path(root, &path);
+        btrfs_release_path(root, path);
+        btrfs_free_path(path);
         return ret;
 }