block: urgent request: remove unnecessary urgent marking
An urgent request is marked by the scheduler in rq->cmd_flags with the
REQ_URGENT flag. There is no need to add an additional marking by
the block layer.
Change-Id: I05d5e9539d2f6c1bfa80240b0671db197a5d3b3f
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
diff --git a/block/blk-core.c b/block/blk-core.c
index fe1c7e0..04604cf 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2131,13 +2131,9 @@
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);
}