diff options
Diffstat (limited to 'block/blk-core.c')
-rw-r--r-- | block/blk-core.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 5d32082ea13..04788065a1d 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2330,13 +2330,9 @@ struct request *blk_fetch_request(struct request_queue *q) rq = blk_peek_request(q); if (rq) { - /* - * Assumption: the next request fetched from scheduler after we - * notified "urgent request pending" - will be the urgent one - */ - if (q->notified_urgent && !q->dispatched_urgent) { + if (rq->cmd_flags & REQ_URGENT) { + WARN_ON(q->dispatched_urgent); q->dispatched_urgent = true; - (void)blk_mark_rq_urgent(rq); } blk_start_request(rq); } |