From nobody Wed Mar 23 16:47:13 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D40EF1A2EE49; Wed, 23 Mar 2022 16:47:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KNvQn5MWtz59P6; Wed, 23 Mar 2022 16:47:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648054033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UyypI51n8z9qHKY4i6SP9rJ30IQLHdmD+lWbwelw7jU=; b=E/qLFP8uJq5ZujLNcpo+EZz/EJI0LGP+WXnnVzBgpMZ+OguEuHoW4YDohKL5p7PevvEJQ/ AzdTuhBHAVR74YPrKx+ZVAHVsxVPwsuROG0yNbXv5IR1hPjRilQigMCWfGcAi7Gez4wY4u qdfIDiWkjN3Zx+fkrddJFAH78779Fp6t9Ya1ptHGYaCOSqFBHi19bjcJbxYB+SeFz7U6K8 /dPzC7HlZb9g7mj6L8nBw8xoiN48UQDmj6Gs8AJphRpRQ+OQgrIWTr+aR0N41ngph9Sef1 6RXd6pHwqbOKaNFzmrzKLHFayvGCz9Y/2T9IYhtgHqHascPupMJ6lGsQ4miLiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 908EA27346; Wed, 23 Mar 2022 16:47:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22NGlDud063942; Wed, 23 Mar 2022 16:47:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22NGlDrW063941; Wed, 23 Mar 2022 16:47:13 GMT (envelope-from git) Date: Wed, 23 Mar 2022 16:47:13 GMT Message-Id: <202203231647.22NGlDrW063941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7524994da0bb - main - callout: Remove the CS_EXECUTING flag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7524994da0bb7b4eb003bc5ac465a316925d40ed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648054033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UyypI51n8z9qHKY4i6SP9rJ30IQLHdmD+lWbwelw7jU=; b=kKcH0Pg2+GmnChFzL7hjjQjIHrTthn8aCBxV7eak8/zmS64uUAQorSV3g+NO6Q/I62Zwkx yt4CrA9k2nz+ygfE2QOLugDfC341AhG4Zvqhs2zYajHEUhyXUTWeEUrMQ2S+FTzF2vUc9d J6QdPXggjlXqFIydgHUUDjpSKbG0ZAA0kVxBEKTb2yAZsF+FhG/23a8Ozync/ah2Q8SrOU tonZsCo8K5Xgre1ZRbjsM4KxJenNLzHucb7Z/lzPDgvgy9NSdocabKgGp7Q5CXwG95boYv OzwCtnCBDtOuN5P2lJngOn1O4CAmEKlLl+tT9115bGsENoDTNMIOs214EWmSGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648054033; a=rsa-sha256; cv=none; b=sfySRXy0XK6EQ/ydAcMYW/R5KwL99gom+yYTitJkoUBLx0gALG2Td9TPGyfBcn+vqw7Ytf DsjL5766EmqAf19fiD71tGksntG22AX8EfbZcPAbJ+DFd1rzLfA4/hSqsODwAw1s66z+6/ N3TGtigG/wOj06WiBOG6HoSaiAdgigh+0aT3Mybu1XVLKrONuw/Q4VfBaj54frP8BoKEb9 7k2ziaFWC9mrLQmoQAKZPCevZFpJrQP0+KX56T4UV0JIXrh4vFmVWJr2kHJZTQXygwFWh6 B6Zau4APyqZjOtYqG7LfhGtKzt+NpdM3OxpvjDwrgYqJ9Yr+/RK6x/w+l4aHZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7524994da0bb7b4eb003bc5ac465a316925d40ed commit 7524994da0bb7b4eb003bc5ac465a316925d40ed Author: Mark Johnston AuthorDate: 2022-03-23 16:37:02 +0000 Commit: Mark Johnston CommitDate: 2022-03-23 16:37:02 +0000 callout: Remove the CS_EXECUTING flag It is now unused. MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34626 --- 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 bc7b50e5ff8f..839c6d84a9ec 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -1309,7 +1309,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); @@ -1321,7 +1321,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 /*