From owner-svn-src-all@freebsd.org Fri Nov 13 23:10:53 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DF5E5A2E72E; Fri, 13 Nov 2015 23:10:53 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (mail.turbocat.net [IPv6:2a01:4f8:d16:4514::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A63981A15; Fri, 13 Nov 2015 23:10:53 +0000 (UTC) (envelope-from hps@selasky.org) Received: from laptop015.home.selasky.org (unknown [62.141.129.119]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 61EE21FE022; Sat, 14 Nov 2015 00:10:50 +0100 (CET) Subject: Re: svn commit: r290805 - in head: share/man/man9 sys/kern sys/net sys/netinet sys/netinet6 sys/netpfil/pf To: Randall Stewart , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201511132251.tADMpa8o053824@repo.freebsd.org> From: Hans Petter Selasky Message-ID: <56466E60.7000304@selasky.org> Date: Sat, 14 Nov 2015 00:12:32 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <201511132251.tADMpa8o053824@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Nov 2015 23:10:54 -0000 On 11/13/15 23:51, Randall Stewart wrote: > Modified: head/sys/kern/subr_taskqueue.c > ============================================================================== > --- head/sys/kern/subr_taskqueue.c Fri Nov 13 22:33:51 2015 (r290804) > +++ head/sys/kern/subr_taskqueue.c Fri Nov 13 22:51:35 2015 (r290805) > @@ -496,7 +496,7 @@ taskqueue_cancel_timeout(struct taskqueu > int error; > > TQ_LOCK(queue); > - pending = !!callout_stop(&timeout_task->c); > + pending = !!(callout_stop(&timeout_task->c) > 0); > error = taskqueue_cancel_locked(queue, &timeout_task->t, &pending1); The "!!" can go away after the "> 0" which is already boolean. --HPS