[PATCH 21/28] blk_end_request: changing xsysace (take 3)
From: Kiyoshi Ueda <hidden>
Date: 2007-11-30 23:34:49
Also in:
dm-devel, linux-scsi, lkml
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 <redacted> Signed-off-by: Jun'ichi Nomura <redacted> --- drivers/block/xsysace.c | 5 +---- 1 files changed, 1 insertion(+), 4 deletions(-) Index: 2.6.24-rc3-mm2/drivers/block/xsysace.c ===================================================================
--- 2.6.24-rc3-mm2.orig/drivers/block/xsysace.c
+++ 2.6.24-rc3-mm2/drivers/block/xsysace.c@@ -703,7 +703,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);
@@ -718,9 +718,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 */