btrfs-progs: convert: Fix a bug that makes convert asserts at scan time

[platform/upstream/btrfs-progs.git] / file-item.c

diff --git a/file-item.c b/file-item.c
index f53a5ca..7a3bbf3 100644 (file)
--- a/file-item.c
+++ b/file-item.c
@@ -25,6 +25,7 @@
 #include "transaction.h"
 #include "print-tree.h"
 #include "crc32c.h"
+#include "internal.h"
 
 #define MAX_CSUM_ITEMS(r,size) ((((BTRFS_LEAF_DATA_SIZE(r) - \
                               sizeof(struct btrfs_item) * 2) / \
@@ -306,7 +307,6 @@ found:
                            csum_size);
        btrfs_mark_buffer_dirty(path->nodes[0]);
 fail:
-       btrfs_release_path(path);
        btrfs_free_path(path);
        return ret;
 }
@@ -367,7 +367,7 @@ static noinline int truncate_one_csum(struct btrfs_trans_handle *trans,
                BUG_ON(ret);
 
                key->offset = end_byte;
-               ret = btrfs_set_item_key_safe(trans, root, path, key);
+               ret = btrfs_set_item_key_safe(root, path, key);
                BUG_ON(ret);
        } else {
                BUG();