From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boaz Harrosh Subject: Re: [PATCH v4 04/12] pktcdvd: Switch to bio_kmalloc() Date: Wed, 25 Jul 2012 14:29:59 +0300 Message-ID: <500FD8B7.9040701@panasas.com> References: <1343160689-12378-1-git-send-email-koverstreet@google.com> <1343160689-12378-5-git-send-email-koverstreet@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1343160689-12378-5-git-send-email-koverstreet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> Sender: linux-bcache-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Kent Overstreet Cc: linux-bcache-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dm-devel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org, agk-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, neilb-l3A5Bk7waGM@public.gmane.org, drbd-dev-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org, vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, mpatocka-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, sage-BnTBU8nroG7k1uMJSBkQmQ@public.gmane.org, yehuda-L5o5AL9CYN0tUFlbccrkMA@public.gmane.org List-Id: dm-devel.ids On 07/24/2012 11:11 PM, Kent Overstreet wrote: > This is prep work for killing bi_destructor - previously, pktcdvd had > its own pkt_bio_alloc which was basically duplication bio_kmalloc(), > necessitating its own bi_destructor implementation. > > Signed-off-by: Kent Overstreet > --- > drivers/block/pktcdvd.c | 115 ++++++++++++++++------------------------------- > 1 files changed, 39 insertions(+), 76 deletions(-) > > diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c > index ba66e44..6fe693a 100644 > --- a/drivers/block/pktcdvd.c > +++ b/drivers/block/pktcdvd.c > @@ -522,36 +522,38 @@ static void pkt_bio_finished(struct pktcdvd_device *pd) > } > } > > -static void pkt_bio_destructor(struct bio *bio) > +static void pkt_end_io_read(struct bio *bio, int err) > { > - kfree(bio->bi_io_vec); > - kfree(bio); > -} Again here, you decided to move the pkt_end_io_read && pkt_end_io_packet_write functions from below, to above here. Which makes it impossible to find any bugs by just reviewing the patch. So I have not reviewed it. I know that you wanted so you can reference them at pkt_alloc_packet_data. I'd use a forward reference, in this case. And a move in a next patch. But this is just me. Perhaps the owner of this code can review it? Cheers Boaz > + struct packet_data *pkt = bio->bi_private; > + struct pktcdvd_device *pd = pkt->pd; > + BUG_ON(!pd); > > -static struct bio *pkt_bio_alloc(int nr_iovecs) > -{ > - struct bio_vec *bvl = NULL; > - struct bio *bio; > + VPRINTK("pkt_end_io_read: bio=%p sec0=%llx sec=%llx err=%d\n", bio, > + (unsigned long long)pkt->sector, (unsigned long long)bio->bi_sector, err); > > - bio = kmalloc(sizeof(struct bio), GFP_KERNEL); > - if (!bio) > - goto no_bio; > - bio_init(bio); > + if (err) > + atomic_inc(&pkt->io_errors); > + if (atomic_dec_and_test(&pkt->io_wait)) { > + atomic_inc(&pkt->run_sm); > + wake_up(&pd->wqueue); > + } > + pkt_bio_finished(pd); > +} > > - bvl = kcalloc(nr_iovecs, sizeof(struct bio_vec), GFP_KERNEL); > - if (!bvl) > - goto no_bvl; > +static void pkt_end_io_packet_write(struct bio *bio, int err) > +{ > + struct packet_data *pkt = bio->bi_private; > + struct pktcdvd_device *pd = pkt->pd; > + BUG_ON(!pd); > > - bio->bi_max_vecs = nr_iovecs; > - bio->bi_io_vec = bvl; > - bio->bi_destructor = pkt_bio_destructor; > + VPRINTK("pkt_end_io_packet_write: id=%d, err=%d\n", pkt->id, err); > > - return bio; > + pd->stats.pkt_ended++; > > - no_bvl: > - kfree(bio); > - no_bio: > - return NULL; > + pkt_bio_finished(pd); > + atomic_dec(&pkt->io_wait); > + atomic_inc(&pkt->run_sm); > + wake_up(&pd->wqueue); > } > > /* > @@ -567,10 +569,13 @@ static struct packet_data *pkt_alloc_packet_data(int frames) > goto no_pkt; > > pkt->frames = frames; > - pkt->w_bio = pkt_bio_alloc(frames); > + pkt->w_bio = bio_kmalloc(GFP_KERNEL, frames); > if (!pkt->w_bio) > goto no_bio; > > + pkt->w_bio->bi_end_io = pkt_end_io_packet_write; > + pkt->w_bio->bi_private = pkt; > + > for (i = 0; i < frames / FRAMES_PER_PAGE; i++) { > pkt->pages[i] = alloc_page(GFP_KERNEL|__GFP_ZERO); > if (!pkt->pages[i]) > @@ -581,9 +586,12 @@ static struct packet_data *pkt_alloc_packet_data(int frames) > bio_list_init(&pkt->orig_bios); > > for (i = 0; i < frames; i++) { > - struct bio *bio = pkt_bio_alloc(1); > + struct bio *bio = bio_kmalloc(GFP_KERNEL, 1); > if (!bio) > goto no_rd_bio; > + > + bio->bi_end_io = pkt_end_io_read; > + bio->bi_private = pkt; > pkt->r_bios[i] = bio; > } > > @@ -1036,40 +1044,6 @@ static void pkt_make_local_copy(struct packet_data *pkt, struct bio_vec *bvec) > } > } > > -static void pkt_end_io_read(struct bio *bio, int err) > -{ > - struct packet_data *pkt = bio->bi_private; > - struct pktcdvd_device *pd = pkt->pd; > - BUG_ON(!pd); > - > - VPRINTK("pkt_end_io_read: bio=%p sec0=%llx sec=%llx err=%d\n", bio, > - (unsigned long long)pkt->sector, (unsigned long long)bio->bi_sector, err); > - > - if (err) > - atomic_inc(&pkt->io_errors); > - if (atomic_dec_and_test(&pkt->io_wait)) { > - atomic_inc(&pkt->run_sm); > - wake_up(&pd->wqueue); > - } > - pkt_bio_finished(pd); > -} > - > -static void pkt_end_io_packet_write(struct bio *bio, int err) > -{ > - struct packet_data *pkt = bio->bi_private; > - struct pktcdvd_device *pd = pkt->pd; > - BUG_ON(!pd); > - > - VPRINTK("pkt_end_io_packet_write: id=%d, err=%d\n", pkt->id, err); > - > - pd->stats.pkt_ended++; > - > - pkt_bio_finished(pd); > - atomic_dec(&pkt->io_wait); > - atomic_inc(&pkt->run_sm); > - wake_up(&pd->wqueue); > -} > - > /* > * Schedule reads for the holes in a packet > */ > @@ -1111,21 +1085,15 @@ static void pkt_gather_data(struct pktcdvd_device *pd, struct packet_data *pkt) > * Schedule reads for missing parts of the packet. > */ > for (f = 0; f < pkt->frames; f++) { > - struct bio_vec *vec; > - > int p, offset; > + > if (written[f]) > continue; > + > bio = pkt->r_bios[f]; > - vec = bio->bi_io_vec; > - bio_init(bio); > - bio->bi_max_vecs = 1; > - bio->bi_sector = pkt->sector + f * (CD_FRAMESIZE >> 9); > - bio->bi_bdev = pd->bdev; > - bio->bi_end_io = pkt_end_io_read; > - bio->bi_private = pkt; > - bio->bi_io_vec = vec; > - bio->bi_destructor = pkt_bio_destructor; > + bio_reset(bio); > + bio->bi_sector = pkt->sector + f * (CD_FRAMESIZE >> 9); > + bio->bi_bdev = pd->bdev; > > p = (f * CD_FRAMESIZE) / PAGE_SIZE; > offset = (f * CD_FRAMESIZE) % PAGE_SIZE; > @@ -1418,14 +1386,9 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) > } > > /* Start the write request */ > - bio_init(pkt->w_bio); > - pkt->w_bio->bi_max_vecs = PACKET_MAX_SIZE; > + bio_reset(pkt->w_bio); > pkt->w_bio->bi_sector = pkt->sector; > pkt->w_bio->bi_bdev = pd->bdev; > - 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(); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from zimbra.linbit.com (zimbra.linbit.com [212.69.161.123]) by mail09.linbit.com (LINBIT Mail Daemon) with ESMTP id EC3581055F5D for ; Thu, 26 Jul 2012 11:35:47 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zimbra.linbit.com (Postfix) with ESMTP id E2C461B4368 for ; Thu, 26 Jul 2012 11:35:47 +0200 (CEST) Received: from zimbra.linbit.com ([127.0.0.1]) by localhost (zimbra.linbit.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vpuMiZUo7B+0 for ; Thu, 26 Jul 2012 11:35:47 +0200 (CEST) Received: from soda.linbit (tuerlsteher.linbit.com [86.59.100.100]) by zimbra.linbit.com (Postfix) with ESMTP id C3E821B436A for ; Thu, 26 Jul 2012 11:35:47 +0200 (CEST) Resent-Message-ID: <20120726093547.GZ29767@soda.linbit> Received: from natasha.panasas.com (natasha.panasas.com [67.152.220.90]) by mail09.linbit.com (LINBIT Mail Daemon) with ESMTP id 3A9551019A78 for ; Wed, 25 Jul 2012 13:30:23 +0200 (CEST) Message-ID: <500FD8B7.9040701@panasas.com> Date: Wed, 25 Jul 2012 14:29:59 +0300 From: Boaz Harrosh MIME-Version: 1.0 To: Kent Overstreet References: <1343160689-12378-1-git-send-email-koverstreet@google.com> <1343160689-12378-5-git-send-email-koverstreet@google.com> In-Reply-To: <1343160689-12378-5-git-send-email-koverstreet@google.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: axboe@kernel.dk, dm-devel@redhat.com, neilb@suse.de, linux-kernel@vger.kernel.org, linux-bcache@vger.kernel.org, mpatocka@redhat.com, vgoyal@redhat.com, yehuda@hq.newdream.net, tj@kernel.org, sage@newdream.net, agk@redhat.com, drbd-dev@lists.linbit.com Subject: Re: [Drbd-dev] [PATCH v4 04/12] pktcdvd: Switch to bio_kmalloc() List-Id: Coordination of development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On 07/24/2012 11:11 PM, Kent Overstreet wrote: > This is prep work for killing bi_destructor - previously, pktcdvd had > its own pkt_bio_alloc which was basically duplication bio_kmalloc(), > necessitating its own bi_destructor implementation. > > Signed-off-by: Kent Overstreet > --- > drivers/block/pktcdvd.c | 115 ++++++++++++++++------------------------------- > 1 files changed, 39 insertions(+), 76 deletions(-) > > diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c > index ba66e44..6fe693a 100644 > --- a/drivers/block/pktcdvd.c > +++ b/drivers/block/pktcdvd.c > @@ -522,36 +522,38 @@ static void pkt_bio_finished(struct pktcdvd_device *pd) > } > } > > -static void pkt_bio_destructor(struct bio *bio) > +static void pkt_end_io_read(struct bio *bio, int err) > { > - kfree(bio->bi_io_vec); > - kfree(bio); > -} Again here, you decided to move the pkt_end_io_read && pkt_end_io_packet_write functions from below, to above here. Which makes it impossible to find any bugs by just reviewing the patch. So I have not reviewed it. I know that you wanted so you can reference them at pkt_alloc_packet_data. I'd use a forward reference, in this case. And a move in a next patch. But this is just me. Perhaps the owner of this code can review it? Cheers Boaz > + struct packet_data *pkt = bio->bi_private; > + struct pktcdvd_device *pd = pkt->pd; > + BUG_ON(!pd); > > -static struct bio *pkt_bio_alloc(int nr_iovecs) > -{ > - struct bio_vec *bvl = NULL; > - struct bio *bio; > + VPRINTK("pkt_end_io_read: bio=%p sec0=%llx sec=%llx err=%d\n", bio, > + (unsigned long long)pkt->sector, (unsigned long long)bio->bi_sector, err); > > - bio = kmalloc(sizeof(struct bio), GFP_KERNEL); > - if (!bio) > - goto no_bio; > - bio_init(bio); > + if (err) > + atomic_inc(&pkt->io_errors); > + if (atomic_dec_and_test(&pkt->io_wait)) { > + atomic_inc(&pkt->run_sm); > + wake_up(&pd->wqueue); > + } > + pkt_bio_finished(pd); > +} > > - bvl = kcalloc(nr_iovecs, sizeof(struct bio_vec), GFP_KERNEL); > - if (!bvl) > - goto no_bvl; > +static void pkt_end_io_packet_write(struct bio *bio, int err) > +{ > + struct packet_data *pkt = bio->bi_private; > + struct pktcdvd_device *pd = pkt->pd; > + BUG_ON(!pd); > > - bio->bi_max_vecs = nr_iovecs; > - bio->bi_io_vec = bvl; > - bio->bi_destructor = pkt_bio_destructor; > + VPRINTK("pkt_end_io_packet_write: id=%d, err=%d\n", pkt->id, err); > > - return bio; > + pd->stats.pkt_ended++; > > - no_bvl: > - kfree(bio); > - no_bio: > - return NULL; > + pkt_bio_finished(pd); > + atomic_dec(&pkt->io_wait); > + atomic_inc(&pkt->run_sm); > + wake_up(&pd->wqueue); > } > > /* > @@ -567,10 +569,13 @@ static struct packet_data *pkt_alloc_packet_data(int frames) > goto no_pkt; > > pkt->frames = frames; > - pkt->w_bio = pkt_bio_alloc(frames); > + pkt->w_bio = bio_kmalloc(GFP_KERNEL, frames); > if (!pkt->w_bio) > goto no_bio; > > + pkt->w_bio->bi_end_io = pkt_end_io_packet_write; > + pkt->w_bio->bi_private = pkt; > + > for (i = 0; i < frames / FRAMES_PER_PAGE; i++) { > pkt->pages[i] = alloc_page(GFP_KERNEL|__GFP_ZERO); > if (!pkt->pages[i]) > @@ -581,9 +586,12 @@ static struct packet_data *pkt_alloc_packet_data(int frames) > bio_list_init(&pkt->orig_bios); > > for (i = 0; i < frames; i++) { > - struct bio *bio = pkt_bio_alloc(1); > + struct bio *bio = bio_kmalloc(GFP_KERNEL, 1); > if (!bio) > goto no_rd_bio; > + > + bio->bi_end_io = pkt_end_io_read; > + bio->bi_private = pkt; > pkt->r_bios[i] = bio; > } > > @@ -1036,40 +1044,6 @@ static void pkt_make_local_copy(struct packet_data *pkt, struct bio_vec *bvec) > } > } > > -static void pkt_end_io_read(struct bio *bio, int err) > -{ > - struct packet_data *pkt = bio->bi_private; > - struct pktcdvd_device *pd = pkt->pd; > - BUG_ON(!pd); > - > - VPRINTK("pkt_end_io_read: bio=%p sec0=%llx sec=%llx err=%d\n", bio, > - (unsigned long long)pkt->sector, (unsigned long long)bio->bi_sector, err); > - > - if (err) > - atomic_inc(&pkt->io_errors); > - if (atomic_dec_and_test(&pkt->io_wait)) { > - atomic_inc(&pkt->run_sm); > - wake_up(&pd->wqueue); > - } > - pkt_bio_finished(pd); > -} > - > -static void pkt_end_io_packet_write(struct bio *bio, int err) > -{ > - struct packet_data *pkt = bio->bi_private; > - struct pktcdvd_device *pd = pkt->pd; > - BUG_ON(!pd); > - > - VPRINTK("pkt_end_io_packet_write: id=%d, err=%d\n", pkt->id, err); > - > - pd->stats.pkt_ended++; > - > - pkt_bio_finished(pd); > - atomic_dec(&pkt->io_wait); > - atomic_inc(&pkt->run_sm); > - wake_up(&pd->wqueue); > -} > - > /* > * Schedule reads for the holes in a packet > */ > @@ -1111,21 +1085,15 @@ static void pkt_gather_data(struct pktcdvd_device *pd, struct packet_data *pkt) > * Schedule reads for missing parts of the packet. > */ > for (f = 0; f < pkt->frames; f++) { > - struct bio_vec *vec; > - > int p, offset; > + > if (written[f]) > continue; > + > bio = pkt->r_bios[f]; > - vec = bio->bi_io_vec; > - bio_init(bio); > - bio->bi_max_vecs = 1; > - bio->bi_sector = pkt->sector + f * (CD_FRAMESIZE >> 9); > - bio->bi_bdev = pd->bdev; > - bio->bi_end_io = pkt_end_io_read; > - bio->bi_private = pkt; > - bio->bi_io_vec = vec; > - bio->bi_destructor = pkt_bio_destructor; > + bio_reset(bio); > + bio->bi_sector = pkt->sector + f * (CD_FRAMESIZE >> 9); > + bio->bi_bdev = pd->bdev; > > p = (f * CD_FRAMESIZE) / PAGE_SIZE; > offset = (f * CD_FRAMESIZE) % PAGE_SIZE; > @@ -1418,14 +1386,9 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) > } > > /* Start the write request */ > - bio_init(pkt->w_bio); > - pkt->w_bio->bi_max_vecs = PACKET_MAX_SIZE; > + bio_reset(pkt->w_bio); > pkt->w_bio->bi_sector = pkt->sector; > pkt->w_bio->bi_bdev = pd->bdev; > - 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(); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756563Ab2GYLac (ORCPT ); Wed, 25 Jul 2012 07:30:32 -0400 Received: from natasha.panasas.com ([67.152.220.90]:34740 "EHLO natasha.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756448Ab2GYLab (ORCPT ); Wed, 25 Jul 2012 07:30:31 -0400 Message-ID: <500FD8B7.9040701@panasas.com> Date: Wed, 25 Jul 2012 14:29:59 +0300 From: Boaz Harrosh User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:8.0) Gecko/20111113 Thunderbird/8.0 MIME-Version: 1.0 To: Kent Overstreet CC: , , , , , , , , , , , Subject: Re: [PATCH v4 04/12] pktcdvd: Switch to bio_kmalloc() References: <1343160689-12378-1-git-send-email-koverstreet@google.com> <1343160689-12378-5-git-send-email-koverstreet@google.com> In-Reply-To: <1343160689-12378-5-git-send-email-koverstreet@google.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/24/2012 11:11 PM, Kent Overstreet wrote: > This is prep work for killing bi_destructor - previously, pktcdvd had > its own pkt_bio_alloc which was basically duplication bio_kmalloc(), > necessitating its own bi_destructor implementation. > > Signed-off-by: Kent Overstreet > --- > drivers/block/pktcdvd.c | 115 ++++++++++++++++------------------------------- > 1 files changed, 39 insertions(+), 76 deletions(-) > > diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c > index ba66e44..6fe693a 100644 > --- a/drivers/block/pktcdvd.c > +++ b/drivers/block/pktcdvd.c > @@ -522,36 +522,38 @@ static void pkt_bio_finished(struct pktcdvd_device *pd) > } > } > > -static void pkt_bio_destructor(struct bio *bio) > +static void pkt_end_io_read(struct bio *bio, int err) > { > - kfree(bio->bi_io_vec); > - kfree(bio); > -} Again here, you decided to move the pkt_end_io_read && pkt_end_io_packet_write functions from below, to above here. Which makes it impossible to find any bugs by just reviewing the patch. So I have not reviewed it. I know that you wanted so you can reference them at pkt_alloc_packet_data. I'd use a forward reference, in this case. And a move in a next patch. But this is just me. Perhaps the owner of this code can review it? Cheers Boaz > + struct packet_data *pkt = bio->bi_private; > + struct pktcdvd_device *pd = pkt->pd; > + BUG_ON(!pd); > > -static struct bio *pkt_bio_alloc(int nr_iovecs) > -{ > - struct bio_vec *bvl = NULL; > - struct bio *bio; > + VPRINTK("pkt_end_io_read: bio=%p sec0=%llx sec=%llx err=%d\n", bio, > + (unsigned long long)pkt->sector, (unsigned long long)bio->bi_sector, err); > > - bio = kmalloc(sizeof(struct bio), GFP_KERNEL); > - if (!bio) > - goto no_bio; > - bio_init(bio); > + if (err) > + atomic_inc(&pkt->io_errors); > + if (atomic_dec_and_test(&pkt->io_wait)) { > + atomic_inc(&pkt->run_sm); > + wake_up(&pd->wqueue); > + } > + pkt_bio_finished(pd); > +} > > - bvl = kcalloc(nr_iovecs, sizeof(struct bio_vec), GFP_KERNEL); > - if (!bvl) > - goto no_bvl; > +static void pkt_end_io_packet_write(struct bio *bio, int err) > +{ > + struct packet_data *pkt = bio->bi_private; > + struct pktcdvd_device *pd = pkt->pd; > + BUG_ON(!pd); > > - bio->bi_max_vecs = nr_iovecs; > - bio->bi_io_vec = bvl; > - bio->bi_destructor = pkt_bio_destructor; > + VPRINTK("pkt_end_io_packet_write: id=%d, err=%d\n", pkt->id, err); > > - return bio; > + pd->stats.pkt_ended++; > > - no_bvl: > - kfree(bio); > - no_bio: > - return NULL; > + pkt_bio_finished(pd); > + atomic_dec(&pkt->io_wait); > + atomic_inc(&pkt->run_sm); > + wake_up(&pd->wqueue); > } > > /* > @@ -567,10 +569,13 @@ static struct packet_data *pkt_alloc_packet_data(int frames) > goto no_pkt; > > pkt->frames = frames; > - pkt->w_bio = pkt_bio_alloc(frames); > + pkt->w_bio = bio_kmalloc(GFP_KERNEL, frames); > if (!pkt->w_bio) > goto no_bio; > > + pkt->w_bio->bi_end_io = pkt_end_io_packet_write; > + pkt->w_bio->bi_private = pkt; > + > for (i = 0; i < frames / FRAMES_PER_PAGE; i++) { > pkt->pages[i] = alloc_page(GFP_KERNEL|__GFP_ZERO); > if (!pkt->pages[i]) > @@ -581,9 +586,12 @@ static struct packet_data *pkt_alloc_packet_data(int frames) > bio_list_init(&pkt->orig_bios); > > for (i = 0; i < frames; i++) { > - struct bio *bio = pkt_bio_alloc(1); > + struct bio *bio = bio_kmalloc(GFP_KERNEL, 1); > if (!bio) > goto no_rd_bio; > + > + bio->bi_end_io = pkt_end_io_read; > + bio->bi_private = pkt; > pkt->r_bios[i] = bio; > } > > @@ -1036,40 +1044,6 @@ static void pkt_make_local_copy(struct packet_data *pkt, struct bio_vec *bvec) > } > } > > -static void pkt_end_io_read(struct bio *bio, int err) > -{ > - struct packet_data *pkt = bio->bi_private; > - struct pktcdvd_device *pd = pkt->pd; > - BUG_ON(!pd); > - > - VPRINTK("pkt_end_io_read: bio=%p sec0=%llx sec=%llx err=%d\n", bio, > - (unsigned long long)pkt->sector, (unsigned long long)bio->bi_sector, err); > - > - if (err) > - atomic_inc(&pkt->io_errors); > - if (atomic_dec_and_test(&pkt->io_wait)) { > - atomic_inc(&pkt->run_sm); > - wake_up(&pd->wqueue); > - } > - pkt_bio_finished(pd); > -} > - > -static void pkt_end_io_packet_write(struct bio *bio, int err) > -{ > - struct packet_data *pkt = bio->bi_private; > - struct pktcdvd_device *pd = pkt->pd; > - BUG_ON(!pd); > - > - VPRINTK("pkt_end_io_packet_write: id=%d, err=%d\n", pkt->id, err); > - > - pd->stats.pkt_ended++; > - > - pkt_bio_finished(pd); > - atomic_dec(&pkt->io_wait); > - atomic_inc(&pkt->run_sm); > - wake_up(&pd->wqueue); > -} > - > /* > * Schedule reads for the holes in a packet > */ > @@ -1111,21 +1085,15 @@ static void pkt_gather_data(struct pktcdvd_device *pd, struct packet_data *pkt) > * Schedule reads for missing parts of the packet. > */ > for (f = 0; f < pkt->frames; f++) { > - struct bio_vec *vec; > - > int p, offset; > + > if (written[f]) > continue; > + > bio = pkt->r_bios[f]; > - vec = bio->bi_io_vec; > - bio_init(bio); > - bio->bi_max_vecs = 1; > - bio->bi_sector = pkt->sector + f * (CD_FRAMESIZE >> 9); > - bio->bi_bdev = pd->bdev; > - bio->bi_end_io = pkt_end_io_read; > - bio->bi_private = pkt; > - bio->bi_io_vec = vec; > - bio->bi_destructor = pkt_bio_destructor; > + bio_reset(bio); > + bio->bi_sector = pkt->sector + f * (CD_FRAMESIZE >> 9); > + bio->bi_bdev = pd->bdev; > > p = (f * CD_FRAMESIZE) / PAGE_SIZE; > offset = (f * CD_FRAMESIZE) % PAGE_SIZE; > @@ -1418,14 +1386,9 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) > } > > /* Start the write request */ > - bio_init(pkt->w_bio); > - pkt->w_bio->bi_max_vecs = PACKET_MAX_SIZE; > + bio_reset(pkt->w_bio); > pkt->w_bio->bi_sector = pkt->sector; > pkt->w_bio->bi_bdev = pd->bdev; > - 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();