p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fs/bio: remove bs paramater in biovec_create_pool 

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

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Fabian Frederick 2014-04-22 15:09:05 -06:00 committed by Jens Axboe
parent 8876e140ec
commit a6c39cb4f7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/bio-integrity.c
View File

@ -617,7 +617,7 @@ int bioset_integrity_create(struct bio_set *bs, int pool_size)
if (!bs->bio_integrity_pool) if (!bs->bio_integrity_pool)
return -1; 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) { if (!bs->bvec_integrity_pool) {
mempool_destroy(bs->bio_integrity_pool); mempool_destroy(bs->bio_integrity_pool);
return -1; return -1;

4
fs/bio.c
View File

@ -1861,7 +1861,7 @@ EXPORT_SYMBOL_GPL(bio_trim);
* create memory pools for biovec's in a bio_set. * create memory pools for biovec's in a bio_set.
* use the global biovec slabs created for general use. * 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; 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) if (!bs->bio_pool)
goto bad; goto bad;
bs->bvec_pool = biovec_create_pool(bs, pool_size); bs->bvec_pool = biovec_create_pool(pool_size);
if (!bs->bvec_pool) if (!bs->bvec_pool)
goto bad; goto bad;

2
include/linux/bio.h
View File

@ -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 struct bio_set *bioset_create(unsigned int, unsigned int);
extern void bioset_free(struct bio_set *); 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 struct bio *bio_alloc_bioset(gfp_t, int, struct bio_set *);
extern void bio_put(struct bio *); extern void bio_put(struct bio *);