[26/40] btrfs: drop private_data parameter from extent_io_tree_init

Message ID	7ec314a9ea8230a64faf2f314423e1a8c7eac07f.1667331828.git.dsterba@suse.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-btrfs-owner@kernel.org> From: David Sterba <dsterba@suse.com> To: linux-btrfs@vger.kernel.org Cc: David Sterba <dsterba@suse.com> Subject: [PATCH 26/40] btrfs: drop private_data parameter from extent_io_tree_init Date: Tue, 1 Nov 2022 21:12:36 +0100 Message-Id: <7ec314a9ea8230a64faf2f314423e1a8c7eac07f.1667331828.git.dsterba@suse.com> In-Reply-To: <cover.1667331828.git.dsterba@suse.com> References: <cover.1667331828.git.dsterba@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Parameter and type changes to btrfs_inode \| expand [00/40] Parameter and type changes to btrfs_inode [01/40] btrfs: change how repair action is passed to btrfs_repair_one_sector [02/40] btrfs: drop parameter compression_type from btrfs_submit_dio_repair_bio [03/40] btrfs: change how submit bio callback is passed to btrfs_wq_submit_bio [04/40] btrfs: simplify btree_submit_bio_start and btrfs_submit_bio_start parameters [05/40] btrfs: switch async_submit_bio::inode to btrfs_inode [06/40] btrfs: pass btrfs_inode to btrfs_submit_bio_start [07/40] btrfs: pass btrfs_inode to btrfs_submit_bio_start_direct_io [08/40] btrfs: pass btrfs_inode to btrfs_wq_submit_bio [09/40] btrfs: pass btrfs_inode to btrfs_submit_metadata_bio [10/40] btrfs: pass btrfs_inode to btrfs_submit_data_write_bio [11/40] btrfs: pass btrfs_inode to btrfs_submit_data_read_bio [12/40] btrfs: pass btrfs_inode to btrfs_submit_dio_repair_bio [13/40] btrfs: pass btrfs_inode to submit_one_bio [14/40] btrfs: pass btrfs_inode to btrfs_repair_one_sector [15/40] btrfs: switch btrfs_dio_private::inode to btrfs_inode [16/40] btrfs: pass btrfs_inode to btrfs_submit_dio_bio [17/40] btrfs: pass btrfs_inode to btrfs_truncate [18/40] btrfs: pass btrfs_inode to btrfs_inode_lock [19/40] btrfs: pass btrfs_inode to btrfs_inode_unlock [20/40] btrfs: pass btrfs_inode to btrfs_dirty_inode [21/40] btrfs: pass btrfs_inode to btrfs_add_delalloc_inodes [22/40] btrfs: switch btrfs_writepage_fixup::inode to btrfs_inode [23/40] btrfs: pass btrfs_inode to btrfs_check_data_csum [24/40] btrfs: pass btrfs_inode to __unlink_start_trans [25/40] btrfs: pass btrfs_inode to btrfs_delete_subvolume [26/40] btrfs: drop private_data parameter from extent_io_tree_init [27/40] btrfs: switch extent_io_tree::private_data to btrfs_inode and rename [28/40] btrfs: pass btrfs_inode to btrfs_merge_delalloc_extent [29/40] btrfs: pass btrfs_inode to btrfs_set_delalloc_extent [30/40] btrfs: pass btrfs_inode to btrfs_split_delalloc_extent [31/40] btrfs: pass btrfs_inode to btrfs_clear_delalloc_extent [32/40] btrfs: pass btrfs_inode to btrfs_unlink_subvol [33/40] btrfs: pass btrfs_inode to btrfs_inode_by_name [34/40] btrfs: pass btrfs_inode to fixup_tree_root_location [35/40] btrfs: pass btrfs_inode to inode_tree_add [36/40] btrfs: pass btrfs_inode to btrfs_inherit_iflags [37/40] btrfs: switch async_chunk::inode to btrfs_inode [38/40] btrfs: use btrfs_inode inside compress_file_range [39/40] btrfs: use btrfs_inode inside btrfs_verify_data_csum [40/40] btrfs: pass btrfs_inode to btrfs_add_delayed_iput

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index c86513e70ff3..d93bb971cc73 100644 --- 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); @@ -2252,7 +2252,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); @@ -3076,7 +3076,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 2cdff74ff033..81365870576f 100644 --- 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 d73ef24bad2e..0e16642c28a3 100644 --- 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 203298546c7e..35b8aae4de5d 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8870,9 +8870,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 1a337602723c..bdf845077002 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -3925,8 +3925,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 1538c65f2b17..9d5cb7fa51d0 100644 --- 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 350da449db08..dfc5c7fa6038 100644 --- 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 2e2dd2ea109b..b8c52e89688c 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -378,9 +378,9 @@ static noinline int join_transaction(struct btrfs_fs_info *fs_info, 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 27fa43f5c4f4..0e3c8860c0a4 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -7036,8 +7036,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;

[26/40] btrfs: drop private_data parameter from extent_io_tree_init

Commit Message

Patch