diff options
| author | Kent Overstreet <koverstreet@google.com> | 2012-09-06 15:34:56 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-09-09 10:35:38 +0200 |
| commit | 1e2a410ff71504a64d1af2e354287ac51aeac1b0 (patch) | |
| tree | e4ae4669d958fc932e5ae67cafd8de860f1f91c9 /fs/bio.c | |
| parent | 395c72a707d966b36d5a42fe12c3a237ded3a0d9 (diff) | |
| download | lwn-1e2a410ff71504a64d1af2e354287ac51aeac1b0.tar.gz lwn-1e2a410ff71504a64d1af2e354287ac51aeac1b0.zip | |
block: Ues bi_pool for bio_integrity_alloc()
Now that bios keep track of where they were allocated from,
bio_integrity_alloc_bioset() becomes redundant.
Remove bio_integrity_alloc_bioset() and drop bio_set argument from the
related functions and make them use bio->bi_pool.
Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
CC: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/bio.c')
| -rw-r--r-- | fs/bio.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -241,7 +241,7 @@ void bio_free(struct bio *bio, struct bio_set *bs) bvec_free_bs(bs, bio->bi_io_vec, BIO_POOL_IDX(bio)); if (bio_integrity(bio)) - bio_integrity_free(bio, bs); + bio_integrity_free(bio); /* * If we have front padding, adjust the bio pointer before freeing @@ -341,7 +341,7 @@ EXPORT_SYMBOL(bio_alloc); static void bio_kmalloc_destructor(struct bio *bio) { if (bio_integrity(bio)) - bio_integrity_free(bio, fs_bio_set); + bio_integrity_free(bio); kfree(bio); } @@ -480,7 +480,7 @@ struct bio *bio_clone(struct bio *bio, gfp_t gfp_mask) if (bio_integrity(bio)) { int ret; - ret = bio_integrity_clone(b, bio, gfp_mask, fs_bio_set); + ret = bio_integrity_clone(b, bio, gfp_mask); if (ret < 0) { bio_put(b); |