From 945122a1d680f44d9e96117e503d7c51219ca957 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 8 May 2009 11:54:10 +0900
Subject: [PATCH] --- yaml --- r: 147023 b: refs/heads/master c:
 bab2a807a489822ded0c9d4a5344c80bcac10b0a h: refs/heads/master i:   147021:
 b3c3334bd77d5f4f51694b9a66d364fc0125fea8   147019:
 c7f3594dd7d748186f1ef4d161060b7e692098a3   147015:
 c76cdad130a806eadbff1c505c9b2474e82c58a9   147007:
 2fe8f76b4ee537b41e98e38e138d82d36c1cb528 v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/block/xd.c | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index f3f93505f50d..e16c29736405 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06b0608e2b46465e8e663214e7db982ddb000346
+refs/heads/master: bab2a807a489822ded0c9d4a5344c80bcac10b0a
diff --git a/trunk/drivers/block/xd.c b/trunk/drivers/block/xd.c
index 4ef88018bcde..d4c4352354b5 100644
--- a/trunk/drivers/block/xd.c
+++ b/trunk/drivers/block/xd.c
@@ -305,26 +305,31 @@ static void do_xd_request (struct request_queue * q)
 	if (xdc_busy)
 		return;
 
-	while ((req = elv_next_request(q)) != NULL) {
+	req = elv_next_request(q);
+	if (req)
+		blkdev_dequeue_request(req);
+
+	while (req) {
 		unsigned block = blk_rq_pos(req);
-		unsigned count = blk_rq_sectors(req);
+		unsigned count = blk_rq_cur_sectors(req);
 		XD_INFO *disk = req->rq_disk->private_data;
-		int res = 0;
+		int res = -EIO;
 		int retry;
 
-		if (!blk_fs_request(req)) {
-			__blk_end_request_cur(req, -EIO);
-			continue;
-		}
-		if (block + count > get_capacity(req->rq_disk)) {
-			__blk_end_request_cur(req, -EIO);
-			continue;
-		}
+		if (!blk_fs_request(req))
+			goto done;
+		if (block + count > get_capacity(req->rq_disk))
+			goto done;
 		for (retry = 0; (retry < XD_RETRIES) && !res; retry++)
 			res = xd_readwrite(rq_data_dir(req), disk, req->buffer,
 					   block, count);
+	done:
 		/* wrap up, 0 = success, -errno = fail */
-		__blk_end_request_cur(req, res);
+		if (!__blk_end_request_cur(req, res)) {
+			req = elv_next_request(q);
+			if (req)
+				blkdev_dequeue_request(req);
+		}
 	}
 }