btrfs: Make btrfs_init_dummy_trans initialize trans' fs_info field

This will be necessary for future cleanups which remove the fs_info
argument from some freespace tree functions.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/tests/btrfs-tests.c b/fs/btrfs/tests/btrfs-tests.c
index 30ed438da2a9f71ba735bcd31f852cfdedc2f4db..db72b3b6209e000e8d4a1a94507ed9185715dd28 100644 (file)
--- a/fs/btrfs/tests/btrfs-tests.c
+++ b/fs/btrfs/tests/btrfs-tests.c
@@ -219,11 +219,13 @@ void btrfs_free_dummy_block_group(struct btrfs_block_group_cache *cache)
        kfree(cache);
 }
 
-void btrfs_init_dummy_trans(struct btrfs_trans_handle *trans)
+void btrfs_init_dummy_trans(struct btrfs_trans_handle *trans,
+                           struct btrfs_fs_info *fs_info)
 {
        memset(trans, 0, sizeof(*trans));
        trans->transid = 1;
        trans->type = __TRANS_DUMMY;
+       trans->fs_info = fs_info;
 }
 
 int btrfs_run_sanity_tests(void)

diff --git a/fs/btrfs/tests/btrfs-tests.h b/fs/btrfs/tests/btrfs-tests.h
index a5a0b9500d3e344307c12e88887c8e4f6ac8328f..4c11cffb377c26426556a44af16931715a526487 100644 (file)
--- a/fs/btrfs/tests/btrfs-tests.h
+++ b/fs/btrfs/tests/btrfs-tests.h
@@ -28,7 +28,8 @@ void btrfs_free_dummy_root(struct btrfs_root *root);
 struct btrfs_block_group_cache *
 btrfs_alloc_dummy_block_group(struct btrfs_fs_info *fs_info, unsigned long length);
 void btrfs_free_dummy_block_group(struct btrfs_block_group_cache *cache);
-void btrfs_init_dummy_trans(struct btrfs_trans_handle *trans);
+void btrfs_init_dummy_trans(struct btrfs_trans_handle *trans,
+                           struct btrfs_fs_info *fs_info);
 #else
 static inline int btrfs_run_sanity_tests(void)
 {

diff --git a/fs/btrfs/tests/free-space-tree-tests.c b/fs/btrfs/tests/free-space-tree-tests.c
index e1f9666c4974074ef410e19f6089751e27a7bac3..a24ead6ceb2bd8c00ba02aa1dc01469b2992d366 100644 (file)
--- a/fs/btrfs/tests/free-space-tree-tests.c
+++ b/fs/btrfs/tests/free-space-tree-tests.c
@@ -482,7 +482,7 @@ static int run_test(test_func_t test_func, int bitmaps, u32 sectorsize,
        cache->needs_free_space = 1;
        cache->fs_info = root->fs_info;
 
-       btrfs_init_dummy_trans(&trans);
+       btrfs_init_dummy_trans(&trans, root->fs_info);
 
        path = btrfs_alloc_path();
        if (!path) {

diff --git a/fs/btrfs/tests/qgroup-tests.c b/fs/btrfs/tests/qgroup-tests.c
index 39b95783f736514ecc1e6e6239bd70de8e8f6086..df4bcce20ba5fb2c6037ce775e0a9e09f636d6d4 100644 (file)
--- a/fs/btrfs/tests/qgroup-tests.c
+++ b/fs/btrfs/tests/qgroup-tests.c
@@ -24,7 +24,7 @@ static int insert_normal_tree_ref(struct btrfs_root *root, u64 bytenr,
        u32 size = sizeof(*item) + sizeof(*iref) + sizeof(*block_info);
        int ret;
 
-       btrfs_init_dummy_trans(&trans);
+       btrfs_init_dummy_trans(&trans, NULL);
 
        ins.objectid = bytenr;
        ins.type = BTRFS_EXTENT_ITEM_KEY;
@@ -74,7 +74,7 @@ static int add_tree_ref(struct btrfs_root *root, u64 bytenr, u64 num_bytes,
        u64 refs;
        int ret;
 
-       btrfs_init_dummy_trans(&trans);
+       btrfs_init_dummy_trans(&trans, NULL);
 
        key.objectid = bytenr;
        key.type = BTRFS_EXTENT_ITEM_KEY;
@@ -124,7 +124,7 @@ static int remove_extent_item(struct btrfs_root *root, u64 bytenr,
        struct btrfs_path *path;
        int ret;
 
-       btrfs_init_dummy_trans(&trans);
+       btrfs_init_dummy_trans(&trans, NULL);
 
        key.objectid = bytenr;
        key.type = BTRFS_EXTENT_ITEM_KEY;
@@ -158,7 +158,7 @@ static int remove_extent_ref(struct btrfs_root *root, u64 bytenr,
        u64 refs;
        int ret;
 
-       btrfs_init_dummy_trans(&trans);
+       btrfs_init_dummy_trans(&trans, NULL);
 
        key.objectid = bytenr;
        key.type = BTRFS_EXTENT_ITEM_KEY;
@@ -213,7 +213,7 @@ static int test_no_shared_qgroup(struct btrfs_root *root,
        struct ulist *new_roots = NULL;
        int ret;
 
-       btrfs_init_dummy_trans(&trans);
+       btrfs_init_dummy_trans(&trans, fs_info);
 
        test_msg("Qgroup basic add\n");
        ret = btrfs_create_qgroup(NULL, fs_info, BTRFS_FS_TREE_OBJECTID);
@@ -314,7 +314,7 @@ static int test_multiple_refs(struct btrfs_root *root,
        struct ulist *new_roots = NULL;
        int ret;
 
-       btrfs_init_dummy_trans(&trans);
+       btrfs_init_dummy_trans(&trans, fs_info);
 
        test_msg("Qgroup multiple refs test\n");