diff --git a/[refs] b/[refs]
index 78a0429a7dd9..060b9b2ef505 100644
--- 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
index 0316f6eece03..00763e510228 100644
--- 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);
 }
 
 /*