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 /block | |
| parent | 395c72a707d966b36d5a42fe12c3a237ded3a0d9 (diff) | |
| download | op-kernel-dev-1e2a410ff71504a64d1af2e354287ac51aeac1b0.zip op-kernel-dev-1e2a410ff71504a64d1af2e354287ac51aeac1b0.tar.gz | |
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 'block')
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 4b4dbdf..95c4935 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2788,7 +2788,7 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src, __bio_clone(bio, bio_src); if (bio_integrity(bio_src) && - bio_integrity_clone(bio, bio_src, gfp_mask, bs)) + bio_integrity_clone(bio, bio_src, gfp_mask)) goto free_and_out; if (bio_ctr && bio_ctr(bio, bio_src, data)) |
