---

yaml --- r: 251171 b: refs/heads/master c: b9f8ce0 h: refs/heads/master i: 251169: 84c08d2 251167: 161f108 v: v3
git-mirror · May 24, 2011 · 18fe7ad · 18fe7ad
1 parent 4f74c60
commit 18fe7ad
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: 4cbadbd16e2fb727f6926597e0a580829e6222f1
+refs/heads/master: b9f8ce059940064a732da49b5d6e618381dad956
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -2102,7 +2102,7 @@ cfq_prio_to_maxrq(struct cfq_data *cfqd, struct cfq_queue *cfqq)
 
 	WARN_ON(cfqq->ioprio >= IOPRIO_BE_NR);
 
-	return 2 * (base_rq + base_rq * (CFQ_PRIO_LISTS - 1 - cfqq->ioprio));
+	return 2 * base_rq * (IOPRIO_BE_NR - cfqq->ioprio);
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up @@
     	WARN_ON(cfqq->ioprio >= IOPRIO_BE_NR);
-    	return 2 * (base_rq + base_rq * (CFQ_PRIO_LISTS - 1 - cfqq->ioprio));
+    	return 2 * base_rq * (IOPRIO_BE_NR - cfqq->ioprio);
     }
     /*
@@ Expand Down @@