X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=block%2Fcfq-iosched.c;h=3a3aee08ec5f4850f0a1877b3bdf86d9b03d9625;hb=0501a3816e5b778830fc2157a6d6bb11a965fc2c;hp=102ebc2c5c34c73f8e7f76c589559ddfde0d9885;hpb=71bc7bf045262e82c645cad48fd56dd17e75344e;p=powerpc.git

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 102ebc2c5c..3a3aee08ec 100644
--- a/block/cfq-iosched.c
+++ b/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;
@@ -1561,7 +1561,7 @@ restart:
 		/* ->key must be copied to avoid race with cfq_exit_queue() */
 		k = __cic->key;
 		if (unlikely(!k)) {
-			cfq_drop_dead_cic(ioc, cic);
+			cfq_drop_dead_cic(ioc, __cic);
 			goto restart;
 		}