From nobody Fri Apr 22 15:25:03 2022 X-Original-To: dev-commits-src-branches@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 040AF19997CA; Fri, 22 Apr 2022 15:25:04 +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 4KlJB75yv0z4SGY; Fri, 22 Apr 2022 15:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650641103; 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=Iz5cRPB2JBpB1APk7Tk/iciFHNT/V0/Z3TLa3ZakBD8=; b=P6/NWzgI+wMOBAPclaFwu9won3nl83oGh01TF7XEQtndZSzGjHagKn+EmvyfT7agmkR9SJ 5CtBUn/vbeOmxLISfFUKQj2iLquAVC3BKYKoVtHgl1jtZVegZeR1gcDPzCRVDoCqx7mg/A 4UQV/FehYxRU3NlEUvFh69kix7Ta/1pgZlDy1B7vpABCpXWJpRk0FfiLn1SRfx7K+ewTYs dPjmiuMjZqti9Hgdkl8OzE2QnWMptOQ9vz/ziIGN56QXMlDoIIsIY1enGrgEuEHjD2mpWG 7nZn3FyIHeeqCTS7xj26f5HejNTYm8ADDU+Es/7P4E98ENiQWg6QkyjRuoHqXw== 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 ACB871FC27; Fri, 22 Apr 2022 15:25:03 +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 23MFP3fG081993; Fri, 22 Apr 2022 15:25:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23MFP3oJ081992; Fri, 22 Apr 2022 15:25:03 GMT (envelope-from git) Date: Fri, 22 Apr 2022 15:25:03 GMT Message-Id: <202204221525.23MFP3oJ081992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: cac2d41f1fc1 - stable/13 - callout: Remove the CS_EXECUTING flag List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: cac2d41f1fc1436c3d3f7f9f2b5e9ed250f4b462 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650641103; 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=Iz5cRPB2JBpB1APk7Tk/iciFHNT/V0/Z3TLa3ZakBD8=; b=AWsntnBxPHtIHIuEhDpQj1s+aEh1NEeLRR2RmJFUic4Bfc1QRU4ilr3/RQrX3vF04d/AcN Z+DhSgIojySXp6yIX69XfURa7a1MCGxU9Tn/+ddmb2+GCWCMifOfybAb4XNYwyEcRaKQ5/ rRXW7kdDUD0I2YYePP/BuoJsGgSjdEZq18oXR81kps6f9U6SEt/JEy5wYjWHGbxf0Hz+R7 m9vLHRNk8JQvFzmNbZoPoiV3BmHG4p5sDUVTNgx27ze8ej1Db15uSWztI2q5ZFls1yV47m qdlOFgOqlSmec/v8Qr/SP6bGvMduTf5/RuhSoPZgahh3piM9mOYyDuRBI3gu3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650641103; a=rsa-sha256; cv=none; b=FsgRNH2O5HF9EmoXd2jrGObT7HFQVM+1cn7tiwV+SbQtWN2tKLtF0x6njtjAF1FU27qTDH UBZs6YvjAYu24u5jZY+hnBDsWdBYpKW4eqnoMfAmWVgXFog/9Ur3ctjd9vAHk90yEqWgTb MAkbzbOSN9wqQop7LE1wfndEq0kdzghobipO6rXlGNIQxKlPrIfibn/7vGd+Wj+MN3BSpq 0smlEXpm3NS1t3MuIlUCiKA8fFRxQNe1qAmR0S6FFX7GLtgGyY54wCvi5HHhfUFCPmjbX4 7BzMf9/BcSx98MEOWImkVevzBUi2UR0+bqOF6Xq5VcCKlbQIQTPeM43yZcGdmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cac2d41f1fc1436c3d3f7f9f2b5e9ed250f4b462 commit cac2d41f1fc1436c3d3f7f9f2b5e9ed250f4b462 Author: Mark Johnston AuthorDate: 2022-03-23 16:37:02 +0000 Commit: Mark Johnston 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 /*