path: root/block
diff options
authorJames Bottomley <>2009-05-30 06:43:49 +0200
committerJens Axboe <>2009-05-30 06:43:49 +0200
commitc143dc903d7c0b15f5052e00b2c7de33a8b4299c (patch)
tree6c7d82a398d92e48ee01563a0fc6f9a13ec442e4 /block
parent5d85d3247cc3555215d7d11c78576a396c98e4d9 (diff)
block: fix an oops on BLKPREP_KILL
Doing a bit of torture testing, I ran across a BUG in the block subsystem (at blk-core.c:2048): the test for if the request is queued. It turns out the trigger was a BLKPREP_KILL coming out of the SCSI prep function. Currently for BLKPREP_KILL requests, we send them straight into __blk_end_request_all() with an error, but they've never been dequeued, so they trip the bug. Fix this by starting requests before killing them. Signed-off-by: James Bottomley <> Signed-off-by: Jens Axboe <>
Diffstat (limited to 'block')
1 files changed, 5 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 8b3b74e69184..7ae83a1e2acf 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1789,6 +1789,11 @@ struct request *blk_peek_request(struct request_queue *q)
} 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);