Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764840AbXIKTPg (ORCPT ); Tue, 11 Sep 2007 15:15:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763355AbXIKTPS (ORCPT ); Tue, 11 Sep 2007 15:15:18 -0400 Received: from qb-out-0506.google.com ([72.14.204.235]:40650 "EHLO qb-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761316AbXIKTPP (ORCPT ); Tue, 11 Sep 2007 15:15:15 -0400 Message-ID: Date: Tue, 11 Sep 2007 13:15:13 -0600 From: "Grant Likely" To: "Kiyoshi Ueda" Subject: Re: [PATCH 22/27] blk_end_request: changing xsysace (take 2) Cc: jens.axboe@oracle.com, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, mike.miller@hp.com, dm-devel@redhat.com, j-nomura@ce.jp.nec.com In-Reply-To: <20070911.150349.43387432.k-ueda@ct.jp.nec.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <20070911.150349.43387432.k-ueda@ct.jp.nec.com> X-Google-Sender-Auth: 1d77927d7a536f5e Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2430 Lines: 58 On 9/11/07, Kiyoshi Ueda wrote: > This patch converts xsysace to use blk_end_request(). > > xsysace is a little bit different from "normal" drivers. > xsysace driver has a state machine in it. > It calls end_that_request_first() and end_that_request_last() > from different states. (ACE_FSM_STATE_REQ_TRANSFER and > ACE_FSM_STATE_REQ_COMPLETE, respectively.) > > However, those states are consecutive and without any interruption > inbetween. > So we can just follow the standard conversion rule (b) mentioned in > the patch subject "[PATCH 01/27] blk_end_request: add new request > completion interface". > > Signed-off-by: Kiyoshi Ueda > Signed-off-by: Jun'ichi Nomura Acked-by: Grant Likely > --- > drivers/block/xsysace.c | 5 +---- > 1 files changed, 1 insertion(+), 4 deletions(-) > > diff -rupN 21-ide-scsi-caller-change/drivers/block/xsysace.c 22-xsysace-caller-change/drivers/block/xsysace.c > --- 21-ide-scsi-caller-change/drivers/block/xsysace.c 2007-09-10 17:32:11.000000000 -0400 > +++ 22-xsysace-caller-change/drivers/block/xsysace.c 2007-09-10 18:14:20.000000000 -0400 > @@ -696,7 +696,7 @@ static void ace_fsm_dostate(struct ace_d > > /* bio finished; is there another one? */ > i = ace->req->current_nr_sectors; > - if (end_that_request_first(ace->req, 1, i)) { > + if (__blk_end_request(ace->req, 1, i)) { > /* dev_dbg(ace->dev, "next block; h=%li c=%i\n", > * ace->req->hard_nr_sectors, > * ace->req->current_nr_sectors); > @@ -711,9 +711,6 @@ static void ace_fsm_dostate(struct ace_d > break; > > case ACE_FSM_STATE_REQ_COMPLETE: > - /* Complete the block request */ > - blkdev_dequeue_request(ace->req); > - end_that_request_last(ace->req, 1); > ace->req = NULL; > > /* Finished request; go to idle state */ > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. grant.likely@secretlab.ca (403) 399-0195 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/