btrfs-progs: test for restoring multiple devices fs into a single device

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

diff --git a/file-item.c b/file-item.c
index d341b55..333fa33 100644 (file)
--- a/file-item.c
+++ b/file-item.c
@@ -277,7 +277,7 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
                diff = diff - btrfs_item_size_nr(leaf, path->slots[0]);
                if (diff != csum_size)
                        goto insert;
-               ret = btrfs_extend_item(trans, root, path, diff);
+               ret = btrfs_extend_item(root, path, diff);
                BUG_ON(ret);
                goto csum;
        }
@@ -310,7 +310,7 @@ csum:
        item = (struct btrfs_csum_item *)((unsigned char *)item +
                                          csum_offset * csum_size);
 found:
-       csum_result = btrfs_csum_data(root, data, csum_result, len);
+       csum_result = btrfs_csum_data(data, csum_result, len);
        btrfs_csum_final(csum_result, (u8 *)&csum_result);
        if (csum_result == 0) {
                printk("csum result is 0 for block %llu\n",
@@ -336,8 +336,7 @@ fail:
  * This calls btrfs_truncate_item with the correct args based on the
  * overlap, and fixes up the key as required.
  */
-static noinline int truncate_one_csum(struct btrfs_trans_handle *trans,
-                                     struct btrfs_root *root,
+static noinline int truncate_one_csum(struct btrfs_root *root,
                                      struct btrfs_path *path,
                                      struct btrfs_key *key,
                                      u64 bytenr, u64 len)
@@ -489,8 +488,7 @@ int btrfs_del_csums(struct btrfs_trans_handle *trans,
 
                        key.offset = end_byte - 1;
                } else {
-                       ret = truncate_one_csum(trans, root, path,
-                                               &key, bytenr, len);
+                       ret = truncate_one_csum(root, path, &key, bytenr, len);
                        BUG_ON(ret);
                }
                btrfs_release_path(path);