diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2022-09-15 02:04:38 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2022-09-26 13:28:06 +0300 |
| commit | c29abab4f9edf843ccbfa9a552a58a12c41d2ce4 (patch) | |
| tree | b1bfeaf7fb3bd217e9a6a4b4e61ec263b8c49725 /fs/btrfs | |
| parent | 16708a889867a77fb3f72820fe5046db9e437eee (diff) | |
| download | linux-c29abab4f9edf843ccbfa9a552a58a12c41d2ce4.tar.xz | |
btrfs: move btrfs_full_stripe_locks_tree into block-group.h
This is actually embedded in struct btrfs_block_group, so move this
definition to block-group.h, and then open-code the init of the tree
where we init the rest of the block group instead of using a helper.
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/block-group.c | 3 | ||||
| -rw-r--r-- | fs/btrfs/block-group.h | 8 | ||||
| -rw-r--r-- | fs/btrfs/ctree.h | 14 |
3 files changed, 10 insertions, 15 deletions
diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index e7b5a54c8258..d83bafc60bf5 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -1926,7 +1926,8 @@ static struct btrfs_block_group *btrfs_create_block_group_cache( btrfs_init_free_space_ctl(cache, cache->free_space_ctl); atomic_set(&cache->frozen, 0); mutex_init(&cache->free_space_lock); - btrfs_init_full_stripe_locks_tree(&cache->full_stripe_locks_root); + cache->full_stripe_locks_root.root = RB_ROOT; + mutex_init(&cache->full_stripe_locks_root.lock); return cache; } diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h index f21a34d719c5..8fb14b99a1d1 100644 --- a/fs/btrfs/block-group.h +++ b/fs/btrfs/block-group.h @@ -76,6 +76,14 @@ struct btrfs_caching_control { /* Once caching_thread() finds this much free space, it will wake up waiters. */ #define CACHING_CTL_WAKE_UP SZ_2M +/* + * Tree to record all locked full stripes of a RAID5/6 block group + */ +struct btrfs_full_stripe_locks_tree { + struct rb_root root; + struct mutex lock; +}; + struct btrfs_block_group { struct btrfs_fs_info *fs_info; struct inode *inode; diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 70eb3aed89bc..2ef8f70934da 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -497,14 +497,6 @@ struct btrfs_free_cluster { struct list_head block_group_list; }; -/* - * Tree to record all locked full stripes of a RAID5/6 block group - */ -struct btrfs_full_stripe_locks_tree { - struct rb_root root; - struct mutex lock; -}; - /* Discard control. */ /* * Async discard uses multiple lists to differentiate the discard filter @@ -4058,12 +4050,6 @@ int btrfs_scrub_cancel(struct btrfs_fs_info *info); int btrfs_scrub_cancel_dev(struct btrfs_device *dev); int btrfs_scrub_progress(struct btrfs_fs_info *fs_info, u64 devid, struct btrfs_scrub_progress *progress); -static inline void btrfs_init_full_stripe_locks_tree( - struct btrfs_full_stripe_locks_tree *locks_root) -{ - locks_root->root = RB_ROOT; - mutex_init(&locks_root->lock); -} /* dev-replace.c */ void btrfs_bio_counter_inc_blocked(struct btrfs_fs_info *fs_info); |