btrfs: reuse exit helper for cleanup in btrfs_bioset_init()
authorYangtao Li <frank.li@vivo.com>
Tue, 15 Apr 2025 03:53:40 +0000 (21:53 -0600)
committerDavid Sterba <dsterba@suse.com>
Thu, 15 May 2025 12:30:46 +0000 (14:30 +0200)
Do not duplicate the cleanup after failed initialization
in btrfs_bioset_init() and reuse the exit function btrfs_bioset_exit().

Signed-off-by: Yangtao Li <frank.li@vivo.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/bio.c

index 8c2eee1f18787e8a34ddcc5db47c9941ec3ad5ed..f602dda99af02970fa405ffa84e7c6f5856d88b4 100644 (file)
@@ -900,22 +900,18 @@ int __init btrfs_bioset_init(void)
                return -ENOMEM;
        if (bioset_init(&btrfs_clone_bioset, BIO_POOL_SIZE,
                        offsetof(struct btrfs_bio, bio), 0))
-               goto out_free_bioset;
+               goto out;
        if (bioset_init(&btrfs_repair_bioset, BIO_POOL_SIZE,
                        offsetof(struct btrfs_bio, bio),
                        BIOSET_NEED_BVECS))
-               goto out_free_clone_bioset;
+               goto out;
        if (mempool_init_kmalloc_pool(&btrfs_failed_bio_pool, BIO_POOL_SIZE,
                                      sizeof(struct btrfs_failed_bio)))
-               goto out_free_repair_bioset;
+               goto out;
        return 0;
 
-out_free_repair_bioset:
-       bioset_exit(&btrfs_repair_bioset);
-out_free_clone_bioset:
-       bioset_exit(&btrfs_clone_bioset);
-out_free_bioset:
-       bioset_exit(&btrfs_bioset);
+out:
+       btrfs_bioset_exit();
        return -ENOMEM;
 }