Date: Fri, 11 Sep 2015 12:45:57 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r287663 - stable/10/sys/kern Message-ID: <201509111245.t8BCjvLN034082@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Fri Sep 11 12:45:56 2015 New Revision: 287663 URL: https://svnweb.freebsd.org/changeset/base/287663 Log: MFC r287354: callout_reset: fix a reversed check for cc_exec_cancel Relnotes: potential erratum Modified: stable/10/sys/kern/kern_timeout.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/kern/kern_timeout.c ============================================================================== --- stable/10/sys/kern/kern_timeout.c Fri Sep 11 12:43:31 2015 (r287662) +++ stable/10/sys/kern/kern_timeout.c Fri Sep 11 12:45:56 2015 (r287663) @@ -1001,7 +1001,7 @@ callout_reset_sbt_on(struct callout *c, * currently in progress. If there is a lock then we * can cancel the callout if it has not really started. */ - if (c->c_lock != NULL && cc_exec_cancel(cc, direct)) + if (c->c_lock != NULL && !cc_exec_cancel(cc, direct)) cancelled = cc_exec_cancel(cc, direct) = true; if (cc_exec_waiting(cc, direct)) { /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509111245.t8BCjvLN034082>