---

yaml --- r: 73102 b: refs/heads/master c: dfb3d72 h: refs/heads/master v: v3
git-mirror · Nov 2, 2007 · 386d731 · 386d731
1 parent 76f9d50
commit 386d731
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d1a536621403b442eef60ddd35e6b7a46fb04b7
+refs/heads/master: dfb3d72a9aa519672c9ae06f0d2f93eccb35482f
diff --git a/trunk/block/deadline-iosched.c b/trunk/block/deadline-iosched.c
@@ -306,12 +306,11 @@ static int deadline_dispatch_requests(struct request_queue *q, int force)
 dispatch_find_request:
 	/*
 	 * we are not running a batch, find best request for selected data_dir
+	 * and start a new batch
 	 */
 	if (deadline_check_fifo(dd, data_dir)) {
 		/* An expired request exists - satisfy it */
-		dd->batching = 0;
 		rq = rq_entry_fifo(dd->fifo_list[data_dir].next);
-
 	} else if (dd->next_rq[data_dir]) {
 		/*
 		 * The last req was the same dir and we have a next request in
@@ -325,12 +324,13 @@ static int deadline_dispatch_requests(struct request_queue *q, int force)
 		 * higher-sectored requests. Go back to the lowest sectored
 		 * request (1 way elevator) and start a new batch.
 		 */
-		dd->batching = 0;
 		node = rb_first(&dd->sort_list[data_dir]);
 		if (node)
 			rq = rb_entry_rq(node);
 	}
 
+	dd->batching = 0;
+
 dispatch_request:
 	/*
 	 * rq is the selected appropriate request.