From nobody Mon Mar 20 13:33:46 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 4PgG0V4Sqtz40k0R; Mon, 20 Mar 2023 13:33:46 +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 4PgG0V42zdz3Ntn; Mon, 20 Mar 2023 13:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319226; 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=2UZRj0x14mNYdMhu0/g2dSoaZKDNnpcfRKP/Ht3JqYQ=; b=ntafdvyti9+lQQUy4/goTJ7d5CS1VhvzruxbBqLl30c8xMTdrkxf52QgYFQmmUd0a9SmOE S07FHP05YYJxt2zCr62IBIE/vGXB0Zn8Ib2IaBUcZPHXplc8h/gWAVYsG09wNxBddkjptw m+eF2GmRp/KekQTGUdxZWkUbASMFx/AvssR/YSvcQevIFsnTLmghSHJ4Ei/ertpUBM4slI aBc6i012uz9SSIoPVFPiQ8GkMT6/W89/AGMvh7lYRJMSLJSCi+2Qk3Qbd4t76P5Id2Wi6j DZKC6gtmhCiN6Y8uJ3IEzhdn+1BVNu75TCoOI0eWs2mDwEZ2c07qvY1d43WatA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319226; 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=2UZRj0x14mNYdMhu0/g2dSoaZKDNnpcfRKP/Ht3JqYQ=; b=VEGZyXGGV4qSnsVTvXyVW2Oe7m/DRUjGielbj1t3eEtMb4dulRWZ82xwyeKscyCr9oEpUp iPSgUOimEMDjeKRVfL4LjLss+JiqhzH+9QCvfcP6NKrSAYOGlE5NbaA4upjcfR/fepIQeo /JKLp2qqxfpTPWD8iBlehFxt/7ztifkDo9Ly0PHHhYwTKC9uZuMzBYWKfjqqqIhj7C72xc +Bgq7C6bXF8u52BfYUu3P1r03Lf9cLa0GNp7+FGDo4lYsC8PDvoEltzMLLFQABfXwdmoKI 0pBLg9dhqWs7SoKJI2vL7c2MLaOTmUpKyDQK3bc8zHF+jVlaARQ+kfM2XEwscg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679319226; a=rsa-sha256; cv=none; b=eLX4bdJWQ/AX4J+MaFXZ5FFDHcCEkgVllKrN8I91dPrGV45EsNL/EJJ/8yC7pYkkK1EWzI Z2VaAjnrRHSn5V61wTBMCEhoXuccWfl/dhcjNG1pDjmAm4f0FnbKKPRx7ase8cWPepSuv5 hDdusIU/MbrpC5sb6QjLU7gojO85JGPBW6Wz0Vg13rka+zNOKrPZI39x5P9f32nw8i5elX rEwKUsONNDZY9iIMDuwbX+WF1Ddf2EC9pBsNRlBnfsl7u9BKSXe98BkMGxCJJqO5MzApnh ow1UBifHVSKqK7nNNFpXdukEd83qTuDlVOH3TEb4bYy62ACXK9gqoLJPIKoWnA== 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 4PgG0V396LzXJL; Mon, 20 Mar 2023 13:33:46 +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 32KDXkGQ073653; Mon, 20 Mar 2023 13:33:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KDXkCw073652; Mon, 20 Mar 2023 13:33:46 GMT (envelope-from git) Date: Mon, 20 Mar 2023 13:33:46 GMT Message-Id: <202303201333.32KDXkCw073652@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: a765d2100e13 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: a765d2100e13cca0b58cd359c6a60dab29e07579 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a765d2100e13cca0b58cd359c6a60dab29e07579 commit a765d2100e13cca0b58cd359c6a60dab29e07579 Author: Mark Johnston AuthorDate: 2023-02-07 21:38:07 +0000 Commit: Mark Johnston CommitDate: 2023-03-20 12:53:49 +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 (cherry picked from commit cd133525fad197ac8cbbd4bd68860a4dd51a561f) --- sys/kern/subr_smr.c | 1 + sys/sys/smr.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) 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); } /*