Commit 53c663ce authored by Kiyoshi Ueda's avatar Kiyoshi Ueda Committed by Jens Axboe

block: fix a possible oops on elv_abort_queue()

I found one more mis-conversion to the 'request is always dequeued
when completing' model in elv_abort_queue() during code inspection.
Although I haven't hit any problem caused by this mis-conversion yet
and just done compile/boot test, please apply if you have no problem.

Request must be dequeued when it completes.
However, elv_abort_queue() completes requests without dequeueing.
This will cause oops in the __blk_end_request_all().
This patch fixes the oops.
Signed-off-by: default avatarKiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: default avatarJun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent c143dc90
...@@ -813,6 +813,11 @@ void elv_abort_queue(struct request_queue *q) ...@@ -813,6 +813,11 @@ void elv_abort_queue(struct request_queue *q)
rq = list_entry_rq(q->queue_head.next); rq = list_entry_rq(q->queue_head.next);
rq->cmd_flags |= REQ_QUIET; rq->cmd_flags |= REQ_QUIET;
trace_block_rq_abort(q, rq); trace_block_rq_abort(q, rq);
/*
* 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); __blk_end_request_all(rq, -EIO);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment