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
This commit is contained in:
Gleb Smirnoff 2016-07-15 09:28:32 +00:00
parent d7e8cfd63d
commit 2138e263cb

View File

@ -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;