From f389a7d3407824efca1090172803908333b7631d Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Tue, 25 Jul 2006 15:05:21 +0200
Subject: [PATCH] --- yaml --- r: 32823 b: refs/heads/master c:
 44eb123126d289bac398cac0232309c228386671 h: refs/heads/master i:   32821:
 3ad2c63a964eece11164123921dc8da457ab5a3b   32819:
 e80d1b193f5b675aa3a1f2fe5bacdcf0261ff1b6   32815:
 567f67f2a9564cb46e5551d696016af067e2f3e1 v: v3

---
 [refs]                    | 2 +-
 trunk/block/cfq-iosched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 44bd165d1b47..ee0d441c0f77 100644
--- 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
index 102ebc2c5c34..aae3123bf3ee 100644
--- 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;