Date: Fri, 22 Apr 2022 15:25:03 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: cac2d41f1fc1 - stable/13 - callout: Remove the CS_EXECUTING flag Message-ID: <202204221525.23MFP3oJ081992@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cac2d41f1fc1436c3d3f7f9f2b5e9ed250f4b462 commit cac2d41f1fc1436c3d3f7f9f2b5e9ed250f4b462 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2022-03-23 16:37:02 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2022-04-22 14:35:54 +0000 callout: Remove the CS_EXECUTING flag It is now unused. Sponsored by: The FreeBSD Foundation (cherry picked from commit 7524994da0bb7b4eb003bc5ac465a316925d40ed) --- sys/kern/kern_timeout.c | 4 ++-- sys/sys/callout.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 2e98c1033ee3..98880524667e 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -1259,7 +1259,7 @@ again: cc_exec_drain(cc, direct) = drain; } CC_UNLOCK(cc); - return ((flags & CS_EXECUTING) != 0); + return (0); } else { CTR3(KTR_CALLOUT, "failed to stop %p func %p arg %p", c, c->c_func, c->c_arg); @@ -1271,7 +1271,7 @@ again: } } KASSERT(!sq_locked, ("sleepqueue chain still locked")); - cancelled = ((flags & CS_EXECUTING) != 0); + cancelled = 0; } else cancelled = 1; diff --git a/sys/sys/callout.h b/sys/sys/callout.h index 41b47a32d9a1..9aa28e29d35c 100644 --- a/sys/sys/callout.h +++ b/sys/sys/callout.h @@ -64,8 +64,6 @@ /* Flags for callout_stop_safe() */ #define CS_DRAIN 0x0001 /* callout_drain(), wait allowed */ -#define CS_EXECUTING 0x0002 /* Positive return value indicates that - the callout was executing */ #ifdef _KERNEL /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204221525.23MFP3oJ081992>