---

yaml --- r: 179685 b: refs/heads/master c: 875feb6 h: refs/heads/master i: 179683: b48386a v: v3
git-mirror · Jan 11, 2010 · 49a456f · 49a456f
1 parent 465a3b3
commit 49a456f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7af92f8754b87bc78cbfd447d5f4096b25c46682
+refs/heads/master: 875feb63b9567442be73efbcc9a8470e376d6423
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -3076,6 +3076,12 @@ cfq_should_preempt(struct cfq_data *cfqd, struct cfq_queue *new_cfqq,
 	if (cfq_class_idle(cfqq))
 		return true;
 
+	/*
+	 * Don't allow a non-RT request to preempt an ongoing RT cfqq timeslice.
+	 */
+	if (cfq_class_rt(cfqq) && !cfq_class_rt(new_cfqq))
+		return false;
+
 	/*
 	 * if the new request is sync, but the currently running queue is
 	 * not, let the sync request have priority.