Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6c39cb4 authored by Fabian Frederick's avatar Fabian Frederick Committed by Jens Axboe
Browse files

fs/bio: remove bs paramater in biovec_create_pool 



bs is no longer used in biovec_create_pool since 9f060e22 ("block:
Convert integrity to bvec_alloc_bs()")

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 8876e140

fs/bio-integrity.c

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ int bioset_integrity_create(struct bio_set *bs, int pool_size) 
	if (!bs->bio_integrity_pool)

		return -1;



	bs->bvec_integrity_pool = biovec_create_pool(bs, pool_size);

	bs->bvec_integrity_pool = biovec_create_pool(pool_size);

	if (!bs->bvec_integrity_pool) {

		mempool_destroy(bs->bio_integrity_pool);

		return -1;

fs/bio.c

+2 −2
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ EXPORT_SYMBOL_GPL(bio_trim); 
 * create memory pools for biovec's in a bio_set.

 * use the global biovec slabs created for general use.

 */

mempool_t *biovec_create_pool(struct bio_set *bs, int pool_entries)

mempool_t *biovec_create_pool(int pool_entries)

{

	struct biovec_slab *bp = bvec_slabs + BIOVEC_MAX_IDX;
@@ -1924,7 +1924,7 @@ struct bio_set *bioset_create(unsigned int pool_size, unsigned int front_pad) 
	if (!bs->bio_pool)

		goto bad;



	bs->bvec_pool = biovec_create_pool(bs, pool_size);

	bs->bvec_pool = biovec_create_pool(pool_size);

	if (!bs->bvec_pool)

		goto bad;

include/linux/bio.h

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ static inline struct bio *bio_next_split(struct bio *bio, int sectors, 


extern struct bio_set *bioset_create(unsigned int, unsigned int);

extern void bioset_free(struct bio_set *);

extern mempool_t *biovec_create_pool(struct bio_set *bs, int pool_entries);

extern mempool_t *biovec_create_pool(int pool_entries);



extern struct bio *bio_alloc_bioset(gfp_t, int, struct bio_set *);

extern void bio_put(struct bio *);