Date: Sat, 9 Jul 2016 17:48:45 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r302501 - projects/hps_head/sys/kern Message-ID: <201607091748.u69HmjaZ028972@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607091748.u69HmjaZ028972>