From 917e6832c09e5f809e3faaa9412492d6f11efad4 Mon Sep 17 00:00:00 2001
From: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Date: Wed, 1 Oct 2008 10:13:44 -0400
Subject: [PATCH] --- yaml --- r: 110560 b: refs/heads/master c:
 99cd3386f290eaf61f2b7596d5a4cc2007771174 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/block/elevator.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4428831d025c..2f51c5fd7f83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7afb3a6e752503d5ebeb038336aa0fa886a51b44
+refs/heads/master: 99cd3386f290eaf61f2b7596d5a4cc2007771174
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 8a74eedc3530..04518921db31 100644
--- a/trunk/block/elevator.c
+++ b/trunk/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);