From 4c7a592f8f83422348055fa2b8363243b4c35375 Mon Sep 17 00:00:00 2001 From: Kiyoshi Ueda Date: Tue, 11 Dec 2007 17:49:46 -0500 Subject: [PATCH] --- yaml --- r: 77634 b: refs/heads/master c: a65b58663d983e588aed8d1bfc75edaac2527fa7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/xsysace.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6ba8b6bbe801..debe13477170 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d699bafe258ebd8f9b4ec182c554200b369a504 +refs/heads/master: a65b58663d983e588aed8d1bfc75edaac2527fa7 diff --git a/trunk/drivers/block/xsysace.c b/trunk/drivers/block/xsysace.c index 82effce97c51..2c81465fd60c 100644 --- a/trunk/drivers/block/xsysace.c +++ b/trunk/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) 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 */