commit 4001b17ec15255c89423860fecef7d25c06f69fa
author Linux Build Service Account <lnxbuild@localhost> Mon May 06 14:52:48 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon May 06 14:52:47 2013 -0700
tree 2c84d6cc7e912d63feb8fa28e63f569b123b6af6
parent 1d2a197291fdef66e3348f57cb3a5f125ba2daf2
parent 2dd5b265d4db5de5bf1d16d072e0ce1ff99c9cf3

Merge "block: urgent: Fix dispatching of URGENT mechanism"

block/blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 69764df..2b6595c 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1123,7 +1123,7 @@
 		 * urgent requests. We want to be able to track this
 		 * down.
 		 */
-		pr_err("%s(): requeueing an URGENT request", __func__);
+		pr_err("%s(): reinserting an URGENT request", __func__);
 		WARN_ON(!q->dispatched_urgent);
 		q->dispatched_urgent = false;
 	}
@@ -2018,6 +2018,10 @@
 			 * not be passed by new incoming requests
 			 */
 			rq->cmd_flags |= REQ_STARTED;
+			if (rq->cmd_flags & REQ_URGENT) {
+				WARN_ON(q->dispatched_urgent);
+				q->dispatched_urgent = true;
+			}
 			trace_block_rq_issue(q, rq);
 		}
 
@@ -2151,13 +2155,8 @@
 	struct request *rq;
 
 	rq = blk_peek_request(q);
-	if (rq) {
-		if (rq->cmd_flags & REQ_URGENT) {
-			WARN_ON(q->dispatched_urgent);
-			q->dispatched_urgent = true;
-		}
+	if (rq)
 		blk_start_request(rq);
-	}
 	return rq;
 }
 EXPORT_SYMBOL(blk_fetch_request);