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);