svn commit: r302501 - projects/hps_head/sys/kern

[Hans Petter Selasky]

Author: hselasky
Date: Sat Jul  9 17:48:45 2016
New Revision: 302501
URL: https://svnweb.freebsd.org/changeset/base/302501

Log:
  Mutex protected callouts are always cancelable.

Modified:
  projects/hps_head/sys/kern/kern_timeout.c

Modified: projects/hps_head/sys/kern/kern_timeout.c
==============================================================================
--- projects/hps_head/sys/kern/kern_timeout.c	Sat Jul  9 17:11:54 2016	(r302500)
+++ projects/hps_head/sys/kern/kern_timeout.c	Sat Jul  9 17:48:45 2016	(r302501)
@@ -1042,7 +1042,7 @@ callout_restart_async(struct callout *c,
 		} else if (cc_exec_cancel(cc, direct) == false ||
 		    cc_exec_restart(cc, direct) == true) {
 			cc_exec_cancel(cc, direct) = true;
-			if (coa != NULL)
+			if (coa != NULL || c->c_lock != NULL)
 				retval = CALLOUT_RET_CANCELLED;
 			else
 				retval = CALLOUT_RET_DRAINING;