svn commit: r287663 - stable/10/sys/kern

[Andriy Gapon]

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)) {
 			/*