diff options
| author | Kiyoshi Ueda <k-ueda@ct.jp.nec.com> | 2008-10-01 10:13:44 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2008-10-09 08:56:21 +0200 |
| commit | 99cd3386f290eaf61f2b7596d5a4cc2007771174 (patch) | |
| tree | 90f93246c060a33b90d0ef3d98f327768f167909 /block/elevator.c | |
| parent | 7afb3a6e752503d5ebeb038336aa0fa886a51b44 (diff) | |
| download | linux-stable-99cd3386f290eaf61f2b7596d5a4cc2007771174.tar.gz linux-stable-99cd3386f290eaf61f2b7596d5a4cc2007771174.tar.bz2 linux-stable-99cd3386f290eaf61f2b7596d5a4cc2007771174.zip | |
block: change elevator to use __blk_end_request()
This patch converts elevator to use __blk_end_request() directly
so that end_{queued|dequeued}_request() can be removed.
Related 'uptodate' arguments is converted to 'error'.
Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/elevator.c b/block/elevator.c index 8a74eedc3530..04518921db31 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -754,7 +754,7 @@ struct request *elv_next_request(struct request_queue *q) * not ever see it. */ if (blk_empty_barrier(rq)) { - end_queued_request(rq, 1); + __blk_end_request(rq, 0, blk_rq_bytes(rq)); continue; } if (!(rq->cmd_flags & REQ_STARTED)) { @@ -825,7 +825,7 @@ struct request *elv_next_request(struct request_queue *q) break; } else if (ret == BLKPREP_KILL) { rq->cmd_flags |= REQ_QUIET; - end_queued_request(rq, 0); + __blk_end_request(rq, -EIO, blk_rq_bytes(rq)); } else { printk(KERN_ERR "%s: bad return=%d\n", __func__, ret); break; @@ -922,7 +922,7 @@ void elv_abort_queue(struct request_queue *q) rq = list_entry_rq(q->queue_head.next); rq->cmd_flags |= REQ_QUIET; blk_add_trace_rq(q, rq, BLK_TA_ABORT); - end_queued_request(rq, 0); + __blk_end_request(rq, -EIO, blk_rq_bytes(rq)); } } EXPORT_SYMBOL(elv_abort_queue); |