btrfs: add additional parameters to btrfs_init_tree_ref/btrfs_init_data_ref

[sfrench/cifs-2.6.git] / fs / btrfs / extent-tree.c

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index de099de3829ec9256a89887b20778fd9cb859e30..a4fbe4b1df80e3cc5ab2ed09e56d15addbc1562e 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -2439,7 +2439,8 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
                                               num_bytes, parent);
                        generic_ref.real_root = root->root_key.objectid;
                        btrfs_init_data_ref(&generic_ref, ref_root, key.objectid,
-                                           key.offset);
+                                           key.offset, root->root_key.objectid,
+                                           for_reloc);
                        generic_ref.skip_qgroup = for_reloc;
                        if (inc)
                                ret = btrfs_inc_extent_ref(trans, &generic_ref);
@@ -2453,7 +2454,8 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans,
                        btrfs_init_generic_ref(&generic_ref, action, bytenr,
                                               num_bytes, parent);
                        generic_ref.real_root = root->root_key.objectid;
-                       btrfs_init_tree_ref(&generic_ref, level - 1, ref_root);
+                       btrfs_init_tree_ref(&generic_ref, level - 1, ref_root,
+                                           root->root_key.objectid, for_reloc);
                        generic_ref.skip_qgroup = for_reloc;
                        if (inc)
                                ret = btrfs_inc_extent_ref(trans, &generic_ref);
@@ -3288,7 +3290,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans,
        btrfs_init_generic_ref(&generic_ref, BTRFS_DROP_DELAYED_REF,
                               buf->start, buf->len, parent);
        btrfs_init_tree_ref(&generic_ref, btrfs_header_level(buf),
-                           root->root_key.objectid);
+                           root->root_key.objectid, 0, false);
 
        if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) {
                btrfs_ref_tree_mod(fs_info, &generic_ref);
@@ -4741,7 +4743,8 @@ int btrfs_alloc_reserved_file_extent(struct btrfs_trans_handle *trans,
 
        btrfs_init_generic_ref(&generic_ref, BTRFS_ADD_DELAYED_EXTENT,
                               ins->objectid, ins->offset, 0);
-       btrfs_init_data_ref(&generic_ref, root->root_key.objectid, owner, offset);
+       btrfs_init_data_ref(&generic_ref, root->root_key.objectid, owner,
+                           offset, 0, false);
        btrfs_ref_tree_mod(root->fs_info, &generic_ref);
 
        return btrfs_add_delayed_data_ref(trans, &generic_ref, ram_bytes);
@@ -4934,7 +4937,8 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,
                btrfs_init_generic_ref(&generic_ref, BTRFS_ADD_DELAYED_EXTENT,
                                       ins.objectid, ins.offset, parent);
                generic_ref.real_root = root->root_key.objectid;
-               btrfs_init_tree_ref(&generic_ref, level, root_objectid);
+               btrfs_init_tree_ref(&generic_ref, level, root_objectid,
+                                   root->root_key.objectid, false);
                btrfs_ref_tree_mod(fs_info, &generic_ref);
                ret = btrfs_add_delayed_tree_ref(trans, &generic_ref, extent_op);
                if (ret)
@@ -5351,7 +5355,8 @@ skip:
 
                btrfs_init_generic_ref(&ref, BTRFS_DROP_DELAYED_REF, bytenr,
                                       fs_info->nodesize, parent);
-               btrfs_init_tree_ref(&ref, level - 1, root->root_key.objectid);
+               btrfs_init_tree_ref(&ref, level - 1, root->root_key.objectid,
+                                   0, false);
                ret = btrfs_free_extent(trans, &ref);
                if (ret)
                        goto out_unlock;