---

yaml --- r: 32823 b: refs/heads/master c: 44eb123 h: refs/heads/master i: 32821: 3ad2c63 32819: e80d1b1 32815: 567f67f v: v3
git-mirror · Jul 25, 2006 · f389a7d · f389a7d
1 parent 4317074
commit f389a7d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad01b1ca797e5898cd40bb32cf0dc8c85aa9f7e8
+refs/heads/master: 44eb123126d289bac398cac0232309c228386671
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -936,7 +936,7 @@ static int cfq_arm_slice_timer(struct cfq_data *cfqd, struct cfq_queue *cfqq)
 	 * seeks. so allow a little bit of time for him to submit a new rq
 	 */
 	if (sample_valid(cic->seek_samples) && CIC_SEEKY(cic))
-		sl = 2;
+		sl = min(sl, msecs_to_jiffies(2));
 
 	mod_timer(&cfqd->idle_slice_timer, jiffies + sl);
 	return 1;