From f316109f185e9add95e29efe9d8baec39e2fbb00 Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Sat, 30 May 2009 06:43:49 +0200
Subject: [PATCH] --- yaml --- r: 147067 b: refs/heads/master c:
 c143dc903d7c0b15f5052e00b2c7de33a8b4299c h: refs/heads/master i:   147065:
 ba7645bf5d82d0acc2764bd40646eb2a7200f77e   147063:
 f6e65d184be7c6e9b62347d340da893600b9b70c v: v3

---
 [refs]                 | 2 +-
 trunk/block/blk-core.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e4b28e340b49..037c5d36adf6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d85d3247cc3555215d7d11c78576a396c98e4d9
+refs/heads/master: c143dc903d7c0b15f5052e00b2c7de33a8b4299c
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
index 8b3b74e69184..7ae83a1e2acf 100644
--- a/trunk/block/blk-core.c
+++ b/trunk/block/blk-core.c
@@ -1789,6 +1789,11 @@ struct request *blk_peek_request(struct request_queue *q)
 			break;
 		} else if (ret == BLKPREP_KILL) {
 			rq->cmd_flags |= REQ_QUIET;
+			/*
+			 * Mark this request as started so we don't trigger
+			 * any debug logic in the end I/O path.
+			 */
+			blk_start_request(rq);
 			__blk_end_request_all(rq, -EIO);
 		} else {
 			printk(KERN_ERR "%s: bad return=%d\n", __func__, ret);