From nobody Wed Sep 04 21:07:40 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 4WzZnn2Dt1z5VNxG; Wed, 04 Sep 2024 21:07:41 +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 4WzZnm3KgNz4W2p; Wed, 4 Sep 2024 21:07:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725484060; 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=70tU5WCmHNxDm2qmMlxTIaL+4UgDShmoLMh4BEbpp/o=; b=IoN1mxM/bovH7fdU7rtX+z3js0sNKqAp8YJxaLQ1UiPZCNlRz6qWOTwRaXg6zfdu8VhQLU 2G6pSs9js7TQVc2YlgORHAGbfehfNlrLtN3vzzJeF2iY5ElSiYUftoiSFx1Auno9Ud6P1U S3hU2lEbugdzsjIGQDr3Fh2bSDVBG+FVBSCxIOK+jEY5YbQi6L3nBh+kmZJKTQcUABwN1O qnv5kGpSGkumFsfyOrnPhgwbFDYCXQ2MMVHPz1w3yrh5EH/8IAxZyffZG0C6tAA6e0Ehr2 bAvRV6Wt+MAsiB+MK2uUJmy9H6xAWzgG1CHnz4MaBRtDQBQ1FZnNqiHi1FngGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725484060; a=rsa-sha256; cv=none; b=j8HY/k6iYeXgbelA9oyy0X6mKRVAVUvxserqNGnKPipeb3YHpo0MgN/4l3O8haKBqhYD0a Pte+fTdzP9ibIZrShexFh6x4yji358HszadR0d3S3VF03+WOHiyn66aC76DNymMhVkWiSC bNWS9tXB9DhmmZ0k5RpVOJnNU2LWUrTFOz4PW+0iXam7P7CNv7lWygZUTrGTxyEW4VEgw5 0+sdWFoT8WQf+7+tkbBA1Ex9il24GeyictJBcqVbWyopVNp2C3scR7T8+s3M7bJSBJsJaO mlYErfyn2+hIdmNFsc/oR8QvKmnE1sv2mv6xt3cbJ2514/bhWW5fQ+YpqUwMRA== 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=1725484060; 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=70tU5WCmHNxDm2qmMlxTIaL+4UgDShmoLMh4BEbpp/o=; b=PnS2C6p362YSEw3uIs0qWnFVDZDxaP97e/gCgqHHKBPO82e1JwEqTKy9gwx0OIuKG6yYnu tFC/nkegxh+qUUIJtvWIoaqkj0JwNwUeIBfoEqqyjEtrufxTX+rn4Y1oi1iE4z7EivBXyu T7QdWNFwWYEjXK/M4u1z2YM/5BsioFTTAC2On5bi6vICMNvTeIKAqBtSWcWcqmRurkZmI2 xeuOh7UN1j0aC8OA47MWLNJLDftDO/1OYQ3FBzAhArTO5EbeF8YLA+1AXK/feE338zTxBi A3S/qDqYXTMX6P0xWTWjm9TWuRpXKynZaABA9BwAgUISm1lpASy9P/3Cq4G1Eg== 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 4WzZnm2yBczgHy; Wed, 4 Sep 2024 21:07:40 +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 484L7e2u053675; Wed, 4 Sep 2024 21:07:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484L7eXe053672; Wed, 4 Sep 2024 21:07:40 GMT (envelope-from git) Date: Wed, 4 Sep 2024 21:07:40 GMT Message-Id: <202409042107.484L7eXe053672@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: f4a2dbb81603 - releng/14.1 - 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/14.1 X-Git-Reftype: branch X-Git-Commit: f4a2dbb8160346509ed96f6d79eb042d4e1ad1cd Auto-Submitted: auto-generated The branch releng/14.1 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f4a2dbb8160346509ed96f6d79eb042d4e1ad1cd commit f4a2dbb8160346509ed96f6d79eb042d4e1ad1cd Author: Olivier Certner AuthorDate: 2024-09-04 14:38:12 +0000 Commit: Ed Maste CommitDate: 2024-09-04 20:46:55 +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) 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 9a6df7ae20ff..2d54850da9c3 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -4359,7 +4359,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)); @@ -4407,7 +4407,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)