Make new_cfqq bool. Also set the variable in the beginning of function. Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx> --- block/cfq-iosched.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index a929e2d..76f020f 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -1622,7 +1622,7 @@ static void cfq_st_add(struct cfq_data *cfqd, struct cfq_queue *cfqq, unsigned long rb_key; struct cfq_rb_root *st; int left; - int new_cfqq = 1; + bool new_cfqq = RB_EMPTY_NODE(&cfqq->rb_node); st = st_for(cfqq->cfqg, cfqq_class(cfqq), cfqq_type(cfqq)); if (cfq_class_idle(cfqq)) { @@ -1649,8 +1649,7 @@ static void cfq_st_add(struct cfq_data *cfqd, struct cfq_queue *cfqq, rb_key += __cfqq ? __cfqq->rb_key : jiffies; } - if (!RB_EMPTY_NODE(&cfqq->rb_node)) { - new_cfqq = 0; + if (!new_cfqq) { /* * same position, nothing more to do */ -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe cgroups" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html