diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 81caceb96c3c..ee54ad01f7ac 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -629,17 +629,8 @@ static void blk_mq_check_expired(struct blk_mq_hw_ctx *hctx, { struct blk_mq_timeout_data *data = priv; - if (!test_bit(REQ_ATOM_STARTED, &rq->atomic_flags)) { - /* - * If a request wasn't started before the queue was - * marked dying, kill it here or it'll go unnoticed. - */ - if (unlikely(blk_queue_dying(rq->q))) { - rq->errors = -EIO; - blk_mq_end_request(rq, rq->errors); - } + if (!test_bit(REQ_ATOM_STARTED, &rq->atomic_flags)) return; - } if (time_after_eq(jiffies, rq->deadline)) { if (!blk_mark_rq_complete(rq)) |