From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760551AbXLLPod (ORCPT ); Wed, 12 Dec 2007 10:44:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758002AbXLLPkP (ORCPT ); Wed, 12 Dec 2007 10:40:15 -0500 Received: from g4t0017.houston.hp.com ([15.201.24.20]:33796 "EHLO g4t0017.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757938AbXLLPkK convert rfc822-to-8bit (ORCPT ); Wed, 12 Dec 2007 10:40:10 -0500 X-Greylist: delayed 620 seconds by postgrey-1.27 at vger.kernel.org; Wed, 12 Dec 2007 10:40:10 EST From: "Miller, Mike (OS Dev)" To: Kiyoshi Ueda , "jens.axboe@oracle.com" CC: "linux-kernel@vger.kernel.org" , "linux-scsi@vger.kernel.org" , "linux-ide@vger.kernel.org" , "dm-devel@redhat.com" , "j-nomura@ce.jp.nec.com" Date: Wed, 12 Dec 2007 15:25:10 +0000 Subject: RE: [PATCH 21/30] blk_end_request: changing cciss (take 4) Thread-Topic: [PATCH 21/30] blk_end_request: changing cciss (take 4) Thread-Index: Acg8SCzQBUxdBTDwQ8+JlcyjUndtcAAirQjQ Message-ID: References: <20071211.175003.10249786.k-ueda@ct.jp.nec.com> In-Reply-To: <20071211.175003.10249786.k-ueda@ct.jp.nec.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > > This patch converts cciss to use blk_end_request interfaces. > Related 'uptodate' arguments are converted to 'error'. > > cciss is a little bit different from "normal" drivers. > cciss directly calls bio_endio() and disk_stat_add() when > completing request. But those can be replaced with > __end_that_request_first(). > After the replacement, request completion procedures of those > drivers become like the following: > o end_that_request_first() > o add_disk_randomness() > o end_that_request_last() > This can be converted to blk_end_request() by following the > rule (a) mentioned in the patch subject "[PATCH 01/30] > blk_end_request: add new request completion interface". > > Cc: Mike Miller > Signed-off-by: Kiyoshi Ueda > Signed-off-by: Jun'ichi Nomura > --- > drivers/block/cciss.c | 25 +++---------------------- > 1 files changed, 3 insertions(+), 22 deletions(-) > > Index: 2.6.24-rc4/drivers/block/cciss.c > =================================================================== > --- 2.6.24-rc4.orig/drivers/block/cciss.c > +++ 2.6.24-rc4/drivers/block/cciss.c > @@ -1187,17 +1187,6 @@ static int cciss_ioctl(struct inode *ino > } > } > > -static inline void complete_buffers(struct bio *bio, int status) -{ > - while (bio) { > - struct bio *xbh = bio->bi_next; > - > - bio->bi_next = NULL; > - bio_endio(bio, status ? 0 : -EIO); > - bio = xbh; > - } > -} > - > static void cciss_check_queues(ctlr_info_t *h) { > int start_queue = h->next_to_run; @@ -1263,21 > +1252,14 @@ static void cciss_softirq_done(struct re > pci_unmap_page(h->pdev, temp64.val, > cmd->SG[i].Len, ddir); > } > > - complete_buffers(rq->bio, (rq->errors == 0)); > - > - if (blk_fs_request(rq)) { > - const int rw = rq_data_dir(rq); > - > - disk_stat_add(rq->rq_disk, sectors[rw], > rq->nr_sectors); > - } > - > #ifdef CCISS_DEBUG > printk("Done with %p\n", rq); > #endif /* CCISS_DEBUG */ > > - add_disk_randomness(rq->rq_disk); > + if (blk_end_request(rq, (rq->errors == 0) ? 0 : -EIO, > blk_rq_bytes(rq))) > + BUG(); > + > spin_lock_irqsave(&h->lock, flags); > - end_that_request_last(rq, (rq->errors == 0)); > cmd_free(h, cmd, 1); > cciss_check_queues(h); > spin_unlock_irqrestore(&h->lock, flags); @@ -2544,7 > +2526,6 @@ after_error_processing: > } > cmd->rq->data_len = 0; > cmd->rq->completion_data = cmd; > - blk_add_trace_rq(cmd->rq->q, cmd->rq, BLK_TA_COMPLETE); Why is this removed? -- mikem > blk_complete_request(cmd->rq); > } > >