summaryrefslogtreecommitdiff
path: root/fs/btrfs/super.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2022-08-06 10:03:21 +0200
committerDavid Sterba <dsterba@suse.com>2022-09-26 12:27:58 +0200
commitd45cfb883b1055651291bc3007ac2d02430f897c (patch)
treef0be43c2ed4498960c1d45adab4e2316d7d6914b /fs/btrfs/super.c
parent1e408af31b4adfae7b6af521315b4bfae0dcf2b5 (diff)
btrfs: move btrfs_bio allocation to volumes.c
volumes.c is the place that implements the storage layer using the btrfs_bio structure, so move the bio_set and allocation helpers there as well. To make up for the new initialization boilerplate, merge the two init/exit helpers in extent_io.c into a single one. Reviewed-by: Nikolay Borisov <nborisov@suse.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Anand Jain <anand.jain@oracle.com> Tested-by: Nikolay Borisov <nborisov@suse.com> Tested-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r--fs/btrfs/super.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index f1c6ca59299e..01dd3c9d713e 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2669,13 +2669,13 @@ static int __init init_btrfs_fs(void)
if (err)
goto free_cachep;
- err = extent_state_cache_init();
+ err = btrfs_bioset_init();
if (err)
goto free_extent_io;
err = extent_map_init();
if (err)
- goto free_extent_state_cache;
+ goto free_bioset;
err = ordered_data_init();
if (err)
@@ -2727,8 +2727,8 @@ free_ordered_data:
ordered_data_exit();
free_extent_map:
extent_map_exit();
-free_extent_state_cache:
- extent_state_cache_exit();
+free_bioset:
+ btrfs_bioset_exit();
free_extent_io:
extent_io_exit();
free_cachep:
@@ -2749,7 +2749,7 @@ static void __exit exit_btrfs_fs(void)
btrfs_prelim_ref_exit();
ordered_data_exit();
extent_map_exit();
- extent_state_cache_exit();
+ btrfs_bioset_exit();
extent_io_exit();
btrfs_interface_exit();
unregister_filesystem(&btrfs_fs_type);