aboutsummaryrefslogtreecommitdiffstats
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r--block/cfq-iosched.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 9e386d9bcb79..9a4eac490e0b 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1865,7 +1865,7 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd)
1865 * task has exited, don't wait 1865 * task has exited, don't wait
1866 */ 1866 */
1867 cic = cfqd->active_cic; 1867 cic = cfqd->active_cic;
1868 if (!cic || !atomic_read(&cic->icq.ioc->nr_tasks)) 1868 if (!cic || !atomic_read(&cic->icq.ioc->active_ref))
1869 return; 1869 return;
1870 1870
1871 /* 1871 /*
@@ -2841,7 +2841,7 @@ cfq_update_idle_window(struct cfq_data *cfqd, struct cfq_queue *cfqq,
2841 2841
2842 if (cfqq->next_rq && (cfqq->next_rq->cmd_flags & REQ_NOIDLE)) 2842 if (cfqq->next_rq && (cfqq->next_rq->cmd_flags & REQ_NOIDLE))
2843 enable_idle = 0; 2843 enable_idle = 0;
2844 else if (!atomic_read(&cic->icq.ioc->nr_tasks) || 2844 else if (!atomic_read(&cic->icq.ioc->active_ref) ||
2845 !cfqd->cfq_slice_idle || 2845 !cfqd->cfq_slice_idle ||
2846 (!cfq_cfqq_deep(cfqq) && CFQQ_SEEKY(cfqq))) 2846 (!cfq_cfqq_deep(cfqq) && CFQQ_SEEKY(cfqq)))
2847 enable_idle = 0; 2847 enable_idle = 0;