]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
fs/bio: remove bs paramater in biovec_create_pool
authorFabian Frederick <fabf@skynet.be>
Tue, 22 Apr 2014 21:09:05 +0000 (15:09 -0600)
committerJens Axboe <axboe@fb.com>
Tue, 22 Apr 2014 21:09:05 +0000 (15:09 -0600)
bs is no longer used in biovec_create_pool since 9f060e2231ca96 ("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>
fs/bio-integrity.c
fs/bio.c
include/linux/bio.h

index 1c2ce0c8771133194ecb9d91517a7dd67c571765..9e241063a616f2c4ad023a08c8b6b06d676adb56 100644 (file)
@@ -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;
index 4c9c5095bacb02aa9a78d54028908d5b007f802d..ca55d37436d6ea5a9128a24411a975532d784145 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -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;
 
index bba5508269219a0726ede9f97cc3d22afa97f213..5a645769f020f956415c1fac11ac868a1922f161 100644 (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 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 *);