Commit:     a65b58663d983e588aed8d1bfc75edaac2527fa7
Parent:     7d699bafe258ebd8f9b4ec182c554200b369a504
Author:     Kiyoshi Ueda <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 11 17:49:46 2007 -0500
Committer:  Jens Axboe <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 10:37:20 2008 +0100

    blk_end_request: changing xsysace (take 4)
    This patch converts xsysace to use blk_end_request interfaces.
    Related 'uptodate' arguments are converted to 'error'.
    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
    So we can just follow the standard conversion rule (b) mentioned in
    the patch subject "[PATCH 01/30] blk_end_request: add new request
    completion interface".
    Cc: Grant Likely <[EMAIL PROTECTED]>
    Signed-off-by: Kiyoshi Ueda <[EMAIL PROTECTED]>
    Signed-off-by: Jun'ichi Nomura <[EMAIL PROTECTED]>
    Signed-off-by: Jens Axboe <[EMAIL PROTECTED]>
 drivers/block/xsysace.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 82effce..2c81465 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -703,7 +703,7 @@ static void ace_fsm_dostate(struct ace_device *ace)
                /* 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, 0, i)) {
                        /* dev_dbg(ace->dev, "next block; h=%li c=%i\n",
                         *      ace->req->hard_nr_sectors,
                         *      ace->req->current_nr_sectors);
@@ -718,9 +718,6 @@ static void ace_fsm_dostate(struct ace_device *ace)
-               /* 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 */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to