diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2008-01-29 21:54:53 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-01-29 21:54:53 +0100 |
| commit | 9bf722598fcd51073974850ae026b44389430ecc (patch) | |
| tree | c1fcb8ac5b1d75ce5c6b6530f874d9a796859cb7 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25 (diff) | |
| download | linux-9bf722598fcd51073974850ae026b44389430ecc.tar.xz linux-9bf722598fcd51073974850ae026b44389430ecc.zip | |
xsysace: end request handling fix
In ace_fsm_dostate(), the variable 'i' was used only for passing
sector size of the request to end_that_request_first().
So I removed it and changed the code to pass the size in bytes
directly to __blk_end_request()
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| -rw-r--r-- | drivers/block/xsysace.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c index 2c81465fd60c..78ebfffc77e3 100644 --- a/drivers/block/xsysace.c +++ b/drivers/block/xsysace.c @@ -483,7 +483,6 @@ static void ace_fsm_dostate(struct ace_device *ace) u32 status; u16 val; int count; - int i; #if defined(DEBUG) dev_dbg(ace->dev, "fsm_state=%i, id_req_count=%i\n", @@ -688,7 +687,6 @@ static void ace_fsm_dostate(struct ace_device *ace) } /* Transfer the next buffer */ - i = 16; if (ace->fsm_task == ACE_TASK_WRITE) ace->reg_ops->dataout(ace); else @@ -702,8 +700,8 @@ static void ace_fsm_dostate(struct ace_device *ace) } /* bio finished; is there another one? */ - i = ace->req->current_nr_sectors; - if (__blk_end_request(ace->req, 0, i)) { + if (__blk_end_request(ace->req, 0, + blk_rq_cur_bytes(ace->req))) { /* dev_dbg(ace->dev, "next block; h=%li c=%i\n", * ace->req->hard_nr_sectors, * ace->req->current_nr_sectors); |