Commit 9bf72259 authored by Jens Axboe's avatar Jens Axboe

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: default avatarJens Axboe <jens.axboe@oracle.com>
parent 0ba6c33b
...@@ -483,7 +483,6 @@ static void ace_fsm_dostate(struct ace_device *ace) ...@@ -483,7 +483,6 @@ static void ace_fsm_dostate(struct ace_device *ace)
u32 status; u32 status;
u16 val; u16 val;
int count; int count;
int i;
#if defined(DEBUG) #if defined(DEBUG)
dev_dbg(ace->dev, "fsm_state=%i, id_req_count=%i\n", 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) ...@@ -688,7 +687,6 @@ static void ace_fsm_dostate(struct ace_device *ace)
} }
/* Transfer the next buffer */ /* Transfer the next buffer */
i = 16;
if (ace->fsm_task == ACE_TASK_WRITE) if (ace->fsm_task == ACE_TASK_WRITE)
ace->reg_ops->dataout(ace); ace->reg_ops->dataout(ace);
else else
...@@ -702,8 +700,8 @@ static void ace_fsm_dostate(struct ace_device *ace) ...@@ -702,8 +700,8 @@ static void ace_fsm_dostate(struct ace_device *ace)
} }
/* bio finished; is there another one? */ /* bio finished; is there another one? */
i = ace->req->current_nr_sectors; if (__blk_end_request(ace->req, 0,
if (__blk_end_request(ace->req, 0, i)) { blk_rq_cur_bytes(ace->req))) {
/* dev_dbg(ace->dev, "next block; h=%li c=%i\n", /* dev_dbg(ace->dev, "next block; h=%li c=%i\n",
* ace->req->hard_nr_sectors, * ace->req->hard_nr_sectors,
* ace->req->current_nr_sectors); * ace->req->current_nr_sectors);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment