From nobody Mon Mar 13 14:51:07 2023 X-Original-To: dev-commits-src-all@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 4Pb02z2jkJz3xnlF; Mon, 13 Mar 2023 14:51:07 +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 4Pb02z2Cgmz411g; Mon, 13 Mar 2023 14:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678719067; 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=2y2GH+PxVJT2I4S1BWsw+Dl9pDuualN6ZX/B9m08OCk=; b=j3nF9PQt1+MpCKHkCFveDd6sngvWLbrd2mnoPl6ZgpYr9cqnSXCPR+13AD7cmLOU5e/G3f JkUQqa3yrAOoAKY9wexWeh2ljXdL3ZDpL/QH0mOIMhm7bA1lRaMF9g8QTAZH0KT3ao1gB+ X2f720ti11QrYv29fFewdfHNmwoQDmQs+WgUxaHT/EpzG0k8ifeVg1pX+RGdWr7rmcABzM lczsfFeQCTgcuE+dClk5FNtb7inFESw2vf0WR54zrWPjkKGvAsEinjM2SjIuFn9TKwXJd9 IbwWpYmmq9h7G/ixeDivhVLIAR8IotQp3jzv9MZwY0qddk5V67gMpoxHgncRPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678719067; 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=2y2GH+PxVJT2I4S1BWsw+Dl9pDuualN6ZX/B9m08OCk=; b=iH1dGbkbMhp7hG78ZVr1ed51WkvJvacDDpThyn0tQWWVOO3m/gpboxwYWp0YdIhe//Wwaj ad4ITZFp+fOuNTC3SZeo86Y5OtXGlqLsJ82aL7eXVe5GlYF+SrZz55pocsdIHbU5bhXR3j Vdg3pje4exuBr0zGhYtXmGJddZgMUfSKZC4i3MmnmhDTAnLomwxr6XP5/UUCHa3+0UJAzi 7STLmbzYv4B5li9Qk1eEZrqaKXZWVKaUcFblSsGKsqnz2y/CaS/kc6FuCsc5QexjyPRo+Q Dk0TR1Im/hqSlICE9W9BOZEXpl9iOZk3HelG6Ziig1pNg9yvEQUE4dd7SR4PeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678719067; a=rsa-sha256; cv=none; b=mBZR/t8oTJcmdtAZUXjcb+0tY9qdNKpv0mQMqxgsXdJK+HlFAXIVndxrpKMXW942GyQzEk 15ynKXBDtKoa8gSW8N2peS66D04qcnQZre94EbYXditIqjT9gjX5i19dSWup5ZQoNenJqh rS1eC7g2T3syE7iQsxOFdMuoyTv6c2t9vpKkzKgjdXbz7QW+3jphanCr+kGKlwi9DI+01w 9CrN8T6Qtp8LHQyudwVDnB2kHTPzau85xEphl+FhflyZc9IMq8OgVORC/H7wvBbR+QSzYI c2wOtUPaQr1HYgdlVJVxCIRFegQ++KgHhR/JEzDKIC+UdShxeowyfCrGkEQS6w== 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 4Pb02z1KNvzxQ7; Mon, 13 Mar 2023 14:51:07 +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 32DEp7Jr037352; Mon, 13 Mar 2023 14:51:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DEp7DQ037351; Mon, 13 Mar 2023 14:51:07 GMT (envelope-from git) Date: Mon, 13 Mar 2023 14:51:07 GMT Message-Id: <202303131451.32DEp7DQ037351@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: cd133525fad1 - main - smr: Remove the return value from smr_wait() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: cd133525fad197ac8cbbd4bd68860a4dd51a561f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cd133525fad197ac8cbbd4bd68860a4dd51a561f commit cd133525fad197ac8cbbd4bd68860a4dd51a561f Author: Mark Johnston AuthorDate: 2023-02-07 21:38:07 +0000 Commit: Mark Johnston CommitDate: 2023-03-13 14:45:35 +0000 smr: Remove the return value from smr_wait() This is supposed to be a blocking version of smr_poll(), so there's no need for a return value. No functional change intended. MFC after: 1 week --- share/man/man9/smr.9 | 2 +- sys/kern/subr_smr.c | 1 + sys/sys/smr.h | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/share/man/man9/smr.9 b/share/man/man9/smr.9 index 7b2ed65b4368..32ef313c0988 100644 --- a/share/man/man9/smr.9 +++ b/share/man/man9/smr.9 @@ -64,7 +64,7 @@ .Fo smr_synchronize .Fa "smr_t smr" .Fc -.Ft bool +.Ft void .Fo smr_wait .Fa "smr_t smr" .Fa "smr_seq_t goal" diff --git a/sys/kern/subr_smr.c b/sys/kern/subr_smr.c index cbbf185fee79..df2520005673 100644 --- a/sys/kern/subr_smr.c +++ b/sys/kern/subr_smr.c @@ -579,6 +579,7 @@ out: */ atomic_thread_fence_acq(); + KASSERT(success || !wait, ("%s: blocking poll failed", __func__)); return (success); } diff --git a/sys/sys/smr.h b/sys/sys/smr.h index 1319e2bf465b..2b6dbeb998da 100644 --- a/sys/sys/smr.h +++ b/sys/sys/smr.h @@ -241,11 +241,11 @@ void smr_destroy(smr_t smr); /* * Blocking wait for all readers to observe 'goal'. */ -static inline bool +static inline void smr_wait(smr_t smr, smr_seq_t goal) { - return (smr_poll(smr, goal, true)); + (void)smr_poll(smr, goal, true); } /*