Date: Mon, 20 Mar 2023 13:33:46 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: a765d2100e13 - stable/13 - smr: Remove the return value from smr_wait() Message-ID: <202303201333.32KDXkCw073652@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=a765d2100e13cca0b58cd359c6a60dab29e07579 commit a765d2100e13cca0b58cd359c6a60dab29e07579 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2023-02-07 21:38:07 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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); } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303201333.32KDXkCw073652>