commit c60d56102364a0983b072481e1bef07321018862
author Linux Build Service Account <lnxbuild@localhost> Tue Oct 16 06:17:47 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Oct 16 06:17:45 2012 -0700
tree c4de70ef6df7ec42c43ac227a267e1fcba465c46
parent 7ec802fcb0e6e965149efc680703d9af8a1c8f22
parent 25f3988ca0157c612975fa16b6792f20b1315d3d

Merge "block: ROW: Fix forced dispatch"

block/row-iosched.c

diff --git a/block/row-iosched.c b/block/row-iosched.c
index 9f5f1db..b7965c6 100644
--- a/block/row-iosched.c
+++ b/block/row-iosched.c
@@ -387,12 +387,19 @@
 	if (list_empty(&rd->row_queues[currq].rqueue.fifo)) {
 		/* check idling */
 		if (delayed_work_pending(&rd->read_idle.idle_work)) {
-			row_log_rowq(rd, currq,
-				     "Delayed work pending. Exiting");
-			goto done;
+			if (force) {
+				(void)cancel_delayed_work(
+				&rd->read_idle.idle_work);
+				row_log_rowq(rd, currq,
+					"Canceled delayed work - forced dispatch");
+			} else {
+				row_log_rowq(rd, currq,
+						 "Delayed work pending. Exiting");
+				goto done;
+			}
 		}
 
-		if (queue_idling_enabled[currq] &&
+		if (!force && queue_idling_enabled[currq] &&
 		    rd->row_queues[currq].rqueue.idle_data.begin_idling) {
 			if (!queue_delayed_work(rd->read_idle.idle_workqueue,
 			    &rd->read_idle.idle_work,