From nobody Wed Sep 04 20:29:50 2024 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 4WzYy70rWXz5VKmx; Wed, 04 Sep 2024 20:29:51 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzYy65tKPz4JRn; Wed, 4 Sep 2024 20:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725481790; 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=1gy6MgbdYOtvyAzXq7wgq1oCdlfZFmEzgZPTrkwHQM0=; b=xn0RfK2bQKqDcVs/SIsm7aweozPsoSBzKw2NF0XFNoZA+aJFEgdUpMZz2sy9Dtb1b4hYbU tdToSsoDH+GpaBb1E9UveO1XOvZkrKnKmj3ADon79x2O4dW3Mf8BKceCjKs3U2LU6wVMS1 ekB4+u+3Zw8dBikFOoLZasmQ0I5Pv4GH0KaPwf1joJstJ81NHlB6FID4Pr0bkqzI3WEU9Y VRQvoNlLMDogxNjBlh2HcQ5ygtD9xNCOJO84hjLh9RTyhh+WosgFZA3nSoq7PJvDV7f1X4 C3LyNT+mb+o5fLUFJR8GSGQEptXGOVw1g+Ia3xG+yuMpINzOynd1Ixj2GZ8GBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725481790; a=rsa-sha256; cv=none; b=aasgtfScbzOO/sAqS7Qz5fRKp/4eu6ydi7d2/Q0QVM87QbKaEVlRXfW6cbeU81thcxjzPu Fea+TP+JONa7RuIHiT35kmBh2tJsk22G/cG0TEAzxRcOpsM/3Gg8rn5yRA1+Jqe+HFknIG XFJiGG6ZAro6Kyu2H8+cFEEBIi1U44dCKAhpwRKku4yyBdAWhUNI4+BrmqRNnkP6z4K0sv +c72IYaeP4tFc1jz7LQ+cQVW/Fj7Ub8xHppi304LTOv30EISQYXV50TylQfw8hNFlJZ2WS DOFVTP6FixF7HSmbgJS5YQnnRrLH3gC6EF+rJlOHqceT2Iafg4ayeJgQW/cH+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725481790; 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=1gy6MgbdYOtvyAzXq7wgq1oCdlfZFmEzgZPTrkwHQM0=; b=Whjvz35ANSNCpSb1V1JYexkfL/Mgg6yOCFNxJtJD7uwNae/e0xr85GWrojctSEPK6k5pZ0 Yt7U9ZrguTLRmodINcaAhTzCa5icgUXbzLgKJUsRV4w9ndF73ZpqgEkPqtBShaFlTnb4vm ZRjnFtZY+PsQQFGZlnr4LnbItmw3jbKeGSPwkdK6rzVrZH3r3v0AwVrjQgMsv9ZHHKHtZs sVexGqpphGQTvdjAmfU23R2MtWwKoxlUj6XrIFXypYpbkWV2QS1Qg/t+XMtJTdCCx9CKgh VGLmBXdJaFwMkwPth+H5J0LVzu4Bq8DqQnANhVVvOcdCZR+K9chgdRKUNlxobw== 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 4WzYy65Rt9zfmr; Wed, 4 Sep 2024 20:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484KToF1082958; Wed, 4 Sep 2024 20:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484KTofa082955; Wed, 4 Sep 2024 20:29:50 GMT (envelope-from git) Date: Wed, 4 Sep 2024 20:29:50 GMT Message-Id: <202409042029.484KTofa082955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8fd0fa88b5a6 - releng/13.3 - umtx: shm: 'ushm_refcnt > 0' => 'ushm_refcnt != 0' 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.3 X-Git-Reftype: branch X-Git-Commit: 8fd0fa88b5a63464165f813df83d371f89853d1b Auto-Submitted: auto-generated The branch releng/13.3 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8fd0fa88b5a63464165f813df83d371f89853d1b commit 8fd0fa88b5a63464165f813df83d371f89853d1b Author: Olivier Certner AuthorDate: 2024-09-04 14:38:12 +0000 Commit: Ed Maste CommitDate: 2024-09-04 20:29:29 +0000 umtx: shm: 'ushm_refcnt > 0' => 'ushm_refcnt != 0' 'ushm_refcnt' is unsigned. Don't leave the impression it isn't. No functional change (intended). Reviewed by: kib Approved by: emaste (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46126 (cherry picked from commit c75a18905e308f69b01f19c3d7d613883a008e79) (cherry picked from commit 4938f554469bc81783998143968ec3eba2a43def) (cherry picked from commit a73a70472c47877d57d090ef77ae503fe75e9f41) Approved by: so --- sys/kern/kern_umtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index 47fb595f433f..29931499fcbe 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -4356,7 +4356,7 @@ umtx_shm_find_reg_locked(const struct umtx_key *key, reg->ushm_key.info.shared.offset == key->info.shared.offset) { KASSERT(reg->ushm_key.type == TYPE_SHM, ("TYPE_USHM")); - KASSERT(reg->ushm_refcnt > 0, + KASSERT(reg->ushm_refcnt != 0, ("reg %p refcnt 0 onlist", reg)); KASSERT((reg->ushm_flags & USHMF_LINKED) != 0, ("reg %p not linked", reg)); @@ -4404,7 +4404,7 @@ static bool umtx_shm_unref_reg_locked(struct umtx_shm_reg *reg, bool linked_ref) { mtx_assert(&umtx_shm_lock, MA_OWNED); - KASSERT(reg->ushm_refcnt > 0, ("ushm_reg %p refcnt 0", reg)); + KASSERT(reg->ushm_refcnt != 0, ("ushm_reg %p refcnt 0", reg)); if (linked_ref) { if ((reg->ushm_flags & USHMF_LINKED) == 0)