---

yaml --- r: 110458 b: refs/heads/master c: 63de428 h: refs/heads/master v: v3
git-mirror · Oct 9, 2008 · d62feb4 · d62feb4
1 parent 4ce1420
commit d62feb4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 766ca4428d1239a970926856c447310c9c191af2
+refs/heads/master: 63de428b139d3d31d86ebe25ae97b33f6540fb7e
diff --git a/trunk/block/deadline-iosched.c b/trunk/block/deadline-iosched.c
@@ -258,17 +258,9 @@ static int deadline_dispatch_requests(struct request_queue *q, int force)
 	else
 		rq = dd->next_rq[READ];
 
-	if (rq) {
-		/* we have a "next request" */
-
-		if (dd->last_sector != rq->sector)
-			/* end the batch on a non sequential request */
-			dd->batching += dd->fifo_batch;
-
-		if (dd->batching < dd->fifo_batch)
-			/* we are still entitled to batch */
-			goto dispatch_request;
-	}
+	if (rq && dd->batching < dd->fifo_batch)
+		/* we have a next request are still entitled to batch */
+		goto dispatch_request;
 
 	/*
 	 * at this point we are not running a batch. select the appropriate