diff options
-rw-r--r-- | block/cfq-iosched.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 9b186fd6bf47..c19d015ac5a5 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -2103,12 +2103,6 @@ static void choose_service_tree(struct cfq_data *cfqd, struct cfq_group *cfqg) | |||
2103 | unsigned group_slice; | 2103 | unsigned group_slice; |
2104 | enum wl_prio_t original_prio = cfqd->serving_prio; | 2104 | enum wl_prio_t original_prio = cfqd->serving_prio; |
2105 | 2105 | ||
2106 | if (!cfqg) { | ||
2107 | cfqd->serving_prio = IDLE_WORKLOAD; | ||
2108 | cfqd->workload_expires = jiffies + 1; | ||
2109 | return; | ||
2110 | } | ||
2111 | |||
2112 | /* Choose next priority. RT > BE > IDLE */ | 2106 | /* Choose next priority. RT > BE > IDLE */ |
2113 | if (cfq_group_busy_queues_wl(RT_WORKLOAD, cfqd, cfqg)) | 2107 | if (cfq_group_busy_queues_wl(RT_WORKLOAD, cfqd, cfqg)) |
2114 | cfqd->serving_prio = RT_WORKLOAD; | 2108 | cfqd->serving_prio = RT_WORKLOAD; |