aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
Diffstat (limited to 'block')
-rw-r--r--block/cfq-iosched.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 9eba291eb6fd..b8174bb4a6a1 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -637,11 +637,11 @@ cfq_set_prio_slice(struct cfq_data *cfqd, struct cfq_queue *cfqq)
637static inline bool cfq_slice_used(struct cfq_queue *cfqq) 637static inline bool cfq_slice_used(struct cfq_queue *cfqq)
638{ 638{
639 if (cfq_cfqq_slice_new(cfqq)) 639 if (cfq_cfqq_slice_new(cfqq))
640 return 0; 640 return false;
641 if (time_before(jiffies, cfqq->slice_end)) 641 if (time_before(jiffies, cfqq->slice_end))
642 return 0; 642 return false;
643 643
644 return 1; 644 return true;
645} 645}
646 646
647/* 647/*
@@ -1892,10 +1892,10 @@ static bool cfq_should_idle(struct cfq_data *cfqd, struct cfq_queue *cfqq)
1892 * in their service tree. 1892 * in their service tree.
1893 */ 1893 */
1894 if (service_tree->count == 1 && cfq_cfqq_sync(cfqq)) 1894 if (service_tree->count == 1 && cfq_cfqq_sync(cfqq))
1895 return 1; 1895 return true;
1896 cfq_log_cfqq(cfqd, cfqq, "Not idling. st->count:%d", 1896 cfq_log_cfqq(cfqd, cfqq, "Not idling. st->count:%d",
1897 service_tree->count); 1897 service_tree->count);
1898 return 0; 1898 return false;
1899} 1899}
1900 1900
1901static void cfq_arm_slice_timer(struct cfq_data *cfqd) 1901static void cfq_arm_slice_timer(struct cfq_data *cfqd)
@@ -2359,12 +2359,12 @@ static inline bool cfq_slice_used_soon(struct cfq_data *cfqd,
2359{ 2359{
2360 /* the queue hasn't finished any request, can't estimate */ 2360 /* the queue hasn't finished any request, can't estimate */
2361 if (cfq_cfqq_slice_new(cfqq)) 2361 if (cfq_cfqq_slice_new(cfqq))
2362 return 1; 2362 return true;
2363 if (time_after(jiffies + cfqd->cfq_slice_idle * cfqq->dispatched, 2363 if (time_after(jiffies + cfqd->cfq_slice_idle * cfqq->dispatched,
2364 cfqq->slice_end)) 2364 cfqq->slice_end))
2365 return 1; 2365 return true;
2366 2366
2367 return 0; 2367 return false;
2368} 2368}
2369 2369
2370static bool cfq_may_dispatch(struct cfq_data *cfqd, struct cfq_queue *cfqq) 2370static bool cfq_may_dispatch(struct cfq_data *cfqd, struct cfq_queue *cfqq)