svn commit: r302894 - head/sys/kern

[Gleb Smirnoff]

Author: glebius
Date: Fri Jul 15 09:28:32 2016
New Revision: 302894
URL: https://svnweb.freebsd.org/changeset/base/302894

Log:
  Fix regression introduced by r302350. The change of return value for a
  callout that wasn't scheduled at all was unintentional and yielded in
  several panics.
  
  PR:		210884

Modified:
  head/sys/kern/kern_timeout.c

Modified: head/sys/kern/kern_timeout.c
==============================================================================
--- head/sys/kern/kern_timeout.c	Fri Jul 15 09:23:18 2016	(r302893)
+++ head/sys/kern/kern_timeout.c	Fri Jul 15 09:28:32 2016	(r302894)
@@ -1381,7 +1381,7 @@ again:
 		CTR3(KTR_CALLOUT, "failed to stop %p func %p arg %p",
 		    c, c->c_func, c->c_arg);
 		CC_UNLOCK(cc);
-		return (cancelled);
+		return (0);
 	}
 
 	c->c_iflags &= ~CALLOUT_PENDING;