diff options
| author | Laurent Riffard <laurent.riffard@free.fr> | 2007-09-21 08:32:28 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-10-16 11:05:09 +0200 |
| commit | 7e3da6c4b9a69f44b758b2c88190ac33ac4ea1a1 (patch) | |
| tree | 3a9efb50fec408d090fbf360da55cf8265139e65 /drivers/block | |
| parent | 761a15e7ac0be7df0c86a55f38a84c080fa179ae (diff) | |
| download | linux-stable-7e3da6c4b9a69f44b758b2c88190ac33ac4ea1a1.tar.gz linux-stable-7e3da6c4b9a69f44b758b2c88190ac33ac4ea1a1.tar.bz2 linux-stable-7e3da6c4b9a69f44b758b2c88190ac33ac4ea1a1.zip | |
pktcdvd: don't rely on bio_init() preserving bio->bi_destructor
Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/pktcdvd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index ba2f550963bc..a8130a4ad6d4 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -1147,6 +1147,7 @@ static void pkt_gather_data(struct pktcdvd_device *pd, struct packet_data *pkt) bio->bi_end_io = pkt_end_io_read; bio->bi_private = pkt; bio->bi_io_vec = vec; + bio->bi_destructor = pkt_bio_destructor; p = (f * CD_FRAMESIZE) / PAGE_SIZE; offset = (f * CD_FRAMESIZE) % PAGE_SIZE; @@ -1444,6 +1445,7 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) pkt->w_bio->bi_end_io = pkt_end_io_packet_write; pkt->w_bio->bi_private = pkt; pkt->w_bio->bi_io_vec = bvec; + pkt->w_bio->bi_destructor = pkt_bio_destructor; for (f = 0; f < pkt->frames; f++) if (!bio_add_page(pkt->w_bio, bvec[f].bv_page, CD_FRAMESIZE, bvec[f].bv_offset)) BUG(); |