Commit 1e408af3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: don't create integrity bioset for btrfs_bioset 



btrfs never uses bio integrity data itself, so don't allocate
the integrity pools for btrfs_bioset.

This patch is a revert of the commit b208c2f7 ("btrfs: Fix crash due
to not allocating integrity data for a set").  The integrity data pool
is not needed, the bio-integrity code now handles allocating the
integrity payload without that.

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Tested-by: default avatarNikolay Borisov <nborisov@suse.com>
Tested-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent fc80f7ac

fs/btrfs/extent_io.c

+0 −6
Original line number Diff line number Diff line
@@ -255,14 +255,8 @@ int __init extent_io_init(void) 
			BIOSET_NEED_BVECS))

		goto free_buffer_cache;



	if (bioset_integrity_create(&btrfs_bioset, BIO_POOL_SIZE))

		goto free_bioset;



	return 0;



free_bioset:

	bioset_exit(&btrfs_bioset);



free_buffer_cache:

	kmem_cache_destroy(extent_buffer_cache);

	extent_buffer_cache = NULL;