Attachment 172407 Details for Bug 210884 – suggested patch: fixes return value for a never scheduled callout

[patch] suggested patch: fixes return value for a never scheduled callout

210884.diff (text/plain), 995 bytes, created by Gleb Smirnoff on 2016-07-12 11:09:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gleb Smirnoff

Created: 2016-07-12 11:09:40 UTC

Size: 995 bytes

patch

obsolete

>Index: kern_timeout.c
>===================================================================
>--- kern_timeout.c	(revision 302634)
>+++ kern_timeout.c	(working copy)
>@@ -1371,6 +1371,16 @@ again:
> 		}
> 		KASSERT(!sq_locked, ("sleepqueue chain still locked"));
> 		cancelled = ((flags & CS_EXECUTING) != 0);
>+	} else if ((c->c_iflags & CALLOUT_PENDING) == 0) {
>+		/*
>+		 * Callout isn't executing and wasn't scheduled at all.
>+		 */
>+		CTR3(KTR_CALLOUT, "failed to stop %p func %p arg %p",
>+		    c, c->c_func, c->c_arg);
>+		CC_UNLOCK(cc);
>+		if (sq_locked)
>+			sleepq_release(&cc_exec_waiting(cc, direct));
>+		return (0);
> 	} else
> 		cancelled = 1;
> 
>@@ -1377,13 +1387,6 @@ again:
> 	if (sq_locked)
> 		sleepq_release(&cc_exec_waiting(cc, direct));
> 
>-	if ((c->c_iflags & CALLOUT_PENDING) == 0) {
>-		CTR3(KTR_CALLOUT, "failed to stop %p func %p arg %p",
>-		    c, c->c_func, c->c_arg);
>-		CC_UNLOCK(cc);
>-		return (cancelled);
>-	}
>-
> 	c->c_iflags &= ~CALLOUT_PENDING;
> 	c->c_flags &= ~CALLOUT_ACTIVE;
>

Actions: View | Diff

Attachments on bug 210884: 172201 | 172202 | 172217 | 172254 | 172266 | 172268 | 172272 | 172407 | 172505 | 172634 | 172639