From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755081Ab2JHVpO (ORCPT ); Mon, 8 Oct 2012 17:45:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63859 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754112Ab2JHVpG (ORCPT ); Mon, 8 Oct 2012 17:45:06 -0400 From: Vivek Goyal To: linux-kernel@vger.kernel.org, axboe@kernel.dk Cc: vgoyal@redhat.com, jmoyer@redhat.com, tj@kernel.org Subject: [PATCH 2/8] cfq-iosched: make new_cfqq variable bool Date: Mon, 8 Oct 2012 17:44:54 -0400 Message-Id: <1349732700-2694-3-git-send-email-vgoyal@redhat.com> In-Reply-To: <1349732700-2694-1-git-send-email-vgoyal@redhat.com> References: <1349732700-2694-1-git-send-email-vgoyal@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make new_cfqq bool. Also set the variable in the beginning of function. Signed-off-by: Vivek Goyal --- 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 c0b492e..ad5f9b6 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -1618,7 +1618,7 @@ static void cfq_service_tree_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)) { @@ -1645,8 +1645,7 @@ static void cfq_service_tree_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