block: Use bioset_init() for fs_bio_set (f4f8154a) · Commits · 戴 / test

block/bio.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ static struct biovec_slab bvec_slabs[BVEC_POOL_NR] __read_mostly = {
		* fs_bio_set is the bio_set containing bio and iovec memory pools used by
		* IO code that does not need private memory pools.
		*/
		struct bio_set *fs_bio_set;
		struct bio_set fs_bio_set;
		EXPORT_SYMBOL(fs_bio_set);

		/*
		@@ -2055,11 +2055,10 @@ static int __init init_bio(void)
		bio_integrity_init();
		biovec_init_slabs();

		fs_bio_set = bioset_create(BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS);
		if (!fs_bio_set)
		if (bioset_init(&fs_bio_set, BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS))
		panic("bio: can't allocate bios\n");

		if (bioset_integrity_create(fs_bio_set, BIO_POOL_SIZE))
		if (bioset_integrity_create(&fs_bio_set, BIO_POOL_SIZE))
		panic("bio: can't create integrity pool\n");

		return 0;

+1 −1

Original line number	Diff line number	Diff line
		@@ -3511,7 +3511,7 @@ int blk_rq_prep_clone(struct request rq, struct request rq_src,
		struct bio bio, bio_src;

		if (!bs)
		bs = fs_bio_set;
		bs = &fs_bio_set;

		__rq_for_each_bio(bio_src, rq_src) {
		bio = bio_clone_fast(bio_src, gfp_mask, bs);

+1 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ static int iblock_configure_device(struct se_device *dev)
		goto out_blkdev_put;
		}
		pr_debug("IBLOCK setup BIP bs->bio_integrity_pool: %p\n",
		bs->bio_integrity_pool);
		&bs->bio_integrity_pool);
		}
		dev->dev_attrib.hw_pi_prot_type = dev->dev_attrib.pi_prot_type;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -423,11 +423,11 @@ extern void __bio_clone_fast(struct bio , struct bio );
		extern struct bio bio_clone_fast(struct bio , gfp_t, struct bio_set *);
		extern struct bio bio_clone_bioset(struct bio , gfp_t, struct bio_set *bs);

		extern struct bio_set *fs_bio_set;
		extern struct bio_set fs_bio_set;

		static inline struct bio *bio_alloc(gfp_t gfp_mask, unsigned int nr_iovecs)
		{
		return bio_alloc_bioset(gfp_mask, nr_iovecs, fs_bio_set);
		return bio_alloc_bioset(gfp_mask, nr_iovecs, &fs_bio_set);
		}

		static inline struct bio *bio_kmalloc(gfp_t gfp_mask, unsigned int nr_iovecs)