Commit c900f415 authored by Yangtao Li's avatar Yangtao Li Committed by David Sterba
Browse files

btrfs: reuse exit helper for cleanup in btrfs_bioset_init() 



Do not duplicate the cleanup after failed initialization
in btrfs_bioset_init() and reuse the exit function btrfs_bioset_exit().

Signed-off-by: default avatarYangtao Li <frank.li@vivo.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent af4fc281

fs/btrfs/bio.c

+5 −9
Original line number Diff line number Diff line
@@ -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;

}