View | Details | Raw Unified | Return to bug 210884 | Differences between
and this patch

Collapse All | Expand All

(-)sys/kern/kern_timeout.c (-1 / +7 lines)
Lines 1380-1387 again: Link Here
1380
	if ((c->c_iflags & CALLOUT_PENDING) == 0) {
1380
	if ((c->c_iflags & CALLOUT_PENDING) == 0) {
1381
		CTR3(KTR_CALLOUT, "failed to stop %p func %p arg %p",
1381
		CTR3(KTR_CALLOUT, "failed to stop %p func %p arg %p",
1382
		    c, c->c_func, c->c_arg);
1382
		    c, c->c_func, c->c_arg);
1383
		/*
1384
		 * For not scheduled and not executing callout return
1385
		 * negative value.
1386
		 */
1387
		if (cc_exec_curr(cc, direct) != c)
1388
			cancelled = -1;
1383
		CC_UNLOCK(cc);
1389
		CC_UNLOCK(cc);
1384
		return (0);
1390
		return (cancelled);
1385
	}
1391
	}
1386
1392
1387
	c->c_iflags &= ~CALLOUT_PENDING;
1393
	c->c_iflags &= ~CALLOUT_PENDING;

Return to bug 210884