From 2138e263cbe206c9cc473a1a5fc42ecaba95c4ea Mon Sep 17 00:00:00 2001
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 15 Jul 2016 09:28:32 +0000
Subject: [PATCH] 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
---
 sys/kern/kern_timeout.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index f8736c5befa1..eefac4459f86 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -1381,7 +1381,7 @@ _callout_stop_safe(struct callout *c, int flags, void (*drain)(void *))
 		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;