From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752171AbbDAFqd (ORCPT ); Wed, 1 Apr 2015 01:46:33 -0400 Received: from smtprelay0111.hostedemail.com ([216.40.44.111]:33140 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750836AbbDAFqa (ORCPT ); Wed, 1 Apr 2015 01:46:30 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::,RULES_HIT:41:355:379:541:800:960:966:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2553:2559:2562:2693:2828:2895:3138:3139:3140:3141:3142:3354:3865:3866:3867:3868:3870:3871:4321:4385:4605:5007:6119:6261:7903:10004:10400:10848:11026:11232:11658:11914:12043:12296:12438:12517:12519:12555:12740:13071:14096:14097:14394:21060:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: car05_1b5fbe0c73927 X-Filterd-Recvd-Size: 3899 Message-ID: <1427867186.18175.60.camel@perches.com> Subject: [PATCH V2 19/25] sched: Use bool function return values of true/false not 1/0 From: Joe Perches To: Jason Low Cc: Linux Kernel Mailing List , Ingo Molnar , Peter Zijlstra Date: Tue, 31 Mar 2015 22:46:26 -0700 In-Reply-To: References: <93bd3fb8db14c75508f7169840824539a3f89606.1427759010.git.joe@perches.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the normal return values for bool functions Update the other sets of ret in try_wait_for_completion. Signed-off-by: Joe Perches --- On Tue, 2015-03-31 at 22:17 -0700, Jason Low wrote: > On Mon, Mar 30, 2015 at 4:46 PM, Joe Perches wrote: > > > * try_wait_for_completion - try to decrement a completion without blocking > > * @x: completion structure > > * > > - * Return: 0 if a decrement cannot be done without blocking > > - * 1 if a decrement succeeded. > > + * Return: true if a decrement cannot be done without blocking > > + * false if a decrement succeeded. > The boolean logic was reversed in this comment. The function should be > returning false if a decrement cannot be done without blocking, and > true if a decrement succeeded. Hi Jason, right, my typo, thanks for noticing. kernel/sched/auto_group.h | 2 +- kernel/sched/completion.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/kernel/sched/auto_group.h b/kernel/sched/auto_group.h index 8bd0471..309b6f2 100644 --- a/kernel/sched/auto_group.h +++ b/kernel/sched/auto_group.h @@ -45,7 +45,7 @@ static inline void autogroup_init(struct task_struct *init_task) { } static inline void autogroup_free(struct task_group *tg) { } static inline bool task_group_is_autogroup(struct task_group *tg) { - return 0; + return false; } static inline struct task_group * diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c index 8d0f35d..cbccaa0 100644 --- a/kernel/sched/completion.c +++ b/kernel/sched/completion.c @@ -255,8 +255,8 @@ EXPORT_SYMBOL(wait_for_completion_killable_timeout); * try_wait_for_completion - try to decrement a completion without blocking * @x: completion structure * - * Return: 0 if a decrement cannot be done without blocking - * 1 if a decrement succeeded. + * Return: false if a decrement cannot be done without blocking + * true if a decrement succeeded. * * If a completion is being used as a counting completion, * attempt to decrement the counter without blocking. This @@ -266,7 +266,7 @@ EXPORT_SYMBOL(wait_for_completion_killable_timeout); bool try_wait_for_completion(struct completion *x) { unsigned long flags; - int ret = 1; + bool ret; /* * Since x->done will need to be locked only @@ -275,13 +275,15 @@ bool try_wait_for_completion(struct completion *x) * return early in the blocking case. */ if (!READ_ONCE(x->done)) - return 0; + return false; spin_lock_irqsave(&x->wait.lock, flags); - if (!x->done) - ret = 0; - else + if (!x->done) { + ret = false; + } else { x->done--; + ret = true; + } spin_unlock_irqrestore(&x->wait.lock, flags); return ret; }