btrfs: drop private_data parameter from extent_io_tree_init

All callers except one pass NULL, so the parameter can be dropped and
the inode::io_tree initialization can be open coded.

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 72e3446..e602e0b 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1044,9 +1044,9 @@ static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info,
        root->anon_dev = 0;
        if (!dummy) {
                extent_io_tree_init(fs_info, &root->dirty_log_pages,
-                                   IO_TREE_ROOT_DIRTY_LOG_PAGES, NULL);
+                                   IO_TREE_ROOT_DIRTY_LOG_PAGES);
                extent_io_tree_init(fs_info, &root->log_csum_range,
-                                   IO_TREE_LOG_CSUM_RANGE, NULL);
+                                   IO_TREE_LOG_CSUM_RANGE);
        }
 
        spin_lock_init(&root->root_item_lock);
@@ -2250,7 +2250,7 @@ static void btrfs_init_btree_inode(struct btrfs_fs_info *fs_info)
 
        RB_CLEAR_NODE(&BTRFS_I(inode)->rb_node);
        extent_io_tree_init(fs_info, &BTRFS_I(inode)->io_tree,
-                           IO_TREE_BTREE_INODE_IO, NULL);
+                           IO_TREE_BTREE_INODE_IO);
        extent_map_tree_init(&BTRFS_I(inode)->extent_tree);
 
        BTRFS_I(inode)->root = btrfs_grab_root(fs_info->tree_root);
@@ -3074,7 +3074,7 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info)
        fs_info->block_group_cache_tree = RB_ROOT_CACHED;
 
        extent_io_tree_init(fs_info, &fs_info->excluded_extents,
-                           IO_TREE_FS_EXCLUDED_EXTENTS, NULL);
+                           IO_TREE_FS_EXCLUDED_EXTENTS);
 
        mutex_init(&fs_info->ordered_operations_mutex);
        mutex_init(&fs_info->tree_log_mutex);

diff --git a/fs/btrfs/extent-io-tree.c b/fs/btrfs/extent-io-tree.c
index 2cdff74..8136587 100644 (file)
--- a/fs/btrfs/extent-io-tree.c
+++ b/fs/btrfs/extent-io-tree.c
@@ -94,13 +94,12 @@ struct tree_entry {
 };
 
 void extent_io_tree_init(struct btrfs_fs_info *fs_info,
-                        struct extent_io_tree *tree, unsigned int owner,
-                        void *private_data)
+                        struct extent_io_tree *tree, unsigned int owner)
 {
        tree->fs_info = fs_info;
        tree->state = RB_ROOT;
        spin_lock_init(&tree->lock);
-       tree->private_data = private_data;
+       tree->private_data = NULL;
        tree->owner = owner;
        if (owner == IO_TREE_INODE_FILE_EXTENT)
                lockdep_set_class(&tree->lock, &file_extent_tree_class);

diff --git a/fs/btrfs/extent-io-tree.h b/fs/btrfs/extent-io-tree.h
index d73ef24..0e16642 100644 (file)
--- a/fs/btrfs/extent-io-tree.h
+++ b/fs/btrfs/extent-io-tree.h
@@ -104,8 +104,7 @@ struct extent_state {
 };
 
 void extent_io_tree_init(struct btrfs_fs_info *fs_info,
-                        struct extent_io_tree *tree, unsigned int owner,
-                        void *private_data);
+                        struct extent_io_tree *tree, unsigned int owner);
 void extent_io_tree_release(struct extent_io_tree *tree);
 
 int lock_extent(struct extent_io_tree *tree, u64 start, u64 end,

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 5e2fd24..29c6c0e 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8871,9 +8871,10 @@ struct inode *btrfs_alloc_inode(struct super_block *sb)
 
        inode = &ei->vfs_inode;
        extent_map_tree_init(&ei->extent_tree);
-       extent_io_tree_init(fs_info, &ei->io_tree, IO_TREE_INODE_IO, inode);
+       extent_io_tree_init(fs_info, &ei->io_tree, IO_TREE_INODE_IO);
+       ei->io_tree.private_data = inode;
        extent_io_tree_init(fs_info, &ei->file_extent_tree,
-                           IO_TREE_INODE_FILE_EXTENT, NULL);
+                           IO_TREE_INODE_FILE_EXTENT);
        ei->io_failure_tree = RB_ROOT;
        atomic_set(&ei->sync_writers, 0);
        mutex_init(&ei->log_mutex);

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index d75b18e..1440cb3 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3928,8 +3928,7 @@ static struct reloc_control *alloc_reloc_control(struct btrfs_fs_info *fs_info)
        INIT_LIST_HEAD(&rc->dirty_subvol_roots);
        btrfs_backref_init_cache(fs_info, &rc->backref_cache, 1);
        mapping_tree_init(&rc->reloc_root_tree);
-       extent_io_tree_init(fs_info, &rc->processed_blocks,
-                           IO_TREE_RELOC_BLOCKS, NULL);
+       extent_io_tree_init(fs_info, &rc->processed_blocks, IO_TREE_RELOC_BLOCKS);
        return rc;
 }
 

diff --git a/fs/btrfs/tests/btrfs-tests.c b/fs/btrfs/tests/btrfs-tests.c
index 669fa71..181469f 100644 (file)
--- a/fs/btrfs/tests/btrfs-tests.c
+++ b/fs/btrfs/tests/btrfs-tests.c
@@ -102,7 +102,7 @@ struct btrfs_device *btrfs_alloc_dummy_device(struct btrfs_fs_info *fs_info)
        if (!dev)
                return ERR_PTR(-ENOMEM);
 
-       extent_io_tree_init(NULL, &dev->alloc_state, 0, NULL);
+       extent_io_tree_init(NULL, &dev->alloc_state, 0);
        INIT_LIST_HEAD(&dev->dev_list);
        list_add(&dev->dev_list, &fs_info->fs_devices->devices);
 

diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c
index 350da44..dfc5c7f 100644 (file)
--- a/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@ -132,7 +132,7 @@ static int test_find_delalloc(u32 sectorsize)
         * Passing NULL as we don't have fs_info but tracepoints are not used
         * at this point
         */
-       extent_io_tree_init(NULL, tmp, IO_TREE_SELFTEST, NULL);
+       extent_io_tree_init(NULL, tmp, IO_TREE_SELFTEST);
 
        /*
         * First go through and create and mark all of our pages dirty, we pin
@@ -489,7 +489,7 @@ static int test_find_first_clear_extent_bit(void)
 
        test_msg("running find_first_clear_extent_bit test");
 
-       extent_io_tree_init(NULL, &tree, IO_TREE_SELFTEST, NULL);
+       extent_io_tree_init(NULL, &tree, IO_TREE_SELFTEST);
 
        /* Test correct handling of empty tree */
        find_first_clear_extent_bit(&tree, 0, &start, &end, CHUNK_TRIMMED);

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 2e2dd2e..b8c52e8 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -378,9 +378,9 @@ loop:
        spin_lock_init(&cur_trans->releasing_ebs_lock);
        list_add_tail(&cur_trans->list, &fs_info->trans_list);
        extent_io_tree_init(fs_info, &cur_trans->dirty_pages,
-                       IO_TREE_TRANS_DIRTY_PAGES, NULL);
+                       IO_TREE_TRANS_DIRTY_PAGES);
        extent_io_tree_init(fs_info, &cur_trans->pinned_extents,
-                       IO_TREE_FS_PINNED_EXTENTS, NULL);
+                       IO_TREE_FS_PINNED_EXTENTS);
        fs_info->generation++;
        cur_trans->transid = fs_info->generation;
        fs_info->running_transaction = cur_trans;

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 7751ab6..acb9749 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -7048,8 +7048,7 @@ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,
 
        atomic_set(&dev->dev_stats_ccnt, 0);
        btrfs_device_data_ordered_init(dev);
-       extent_io_tree_init(fs_info, &dev->alloc_state,
-                           IO_TREE_DEVICE_ALLOC_STATE, NULL);
+       extent_io_tree_init(fs_info, &dev->alloc_state, IO_TREE_DEVICE_ALLOC_STATE);
 
        if (devid)
                tmp = *devid;