From nobody Wed Sep 4 19:58:30 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 4WzYFz0mfYz5VHCD; Wed, 04 Sep 2024 19:58:31 +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 4WzYFy6sVFz49jt; Wed, 4 Sep 2024 19:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725479911; 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=qL0N96SEHROw8mnF+5YONZGT1lR5btgDbwSySaU2Vl4=; b=vytYJU5jLGS6JGzywfXiOY/gBjYK7AlFxUYL1tkqy2Hev+vmZD163mlAz2/m3CSDa0B0XN AaVMGqIEUHz/VyeFcv4YTqDDdxmNtVXxSDEdRcMHHx1UZLAAQJSqDVurwXm/DJe53YAXw6 QA4SRxnyE6YqaP6WentJTrWeNPVJ3PoClKXLHCGxGZtJrhFTtwSTOfba33ahuA9eIXZDCD /gv4DSNWIW8r7Dg5CWpzdAOKsd7A4Uq+m4pVHDPajLojQT5vMt1bUOSZ2LooEljvLkA954 IFrlZokdQMmkjizN3u8y1YCakznwq7qdNE+a/B4kkzNIJlVDCySc94PpYARtag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725479911; a=rsa-sha256; cv=none; b=nMpzPLBqjMCfUiEQzCpNo1wzzdje7lTmPoI+1y65i423qMxyM+qeT7JXk++ceLJySlj7Do Xs6Uc9JwqcvVRgkqUzj0CCuUpY2NVMhmjHRdwhwJmQF9jfgCokEsvUNPm2UjTU7p+zSiW/ u3718TohAQManfjGbAn05CL9MGKeAWuwRtjMSYr04eNwBvE4j4q0UUC7qcyay4nylwVl/7 i5rNs3U8fFP54K8Zw9aN4eK7B4QhtGNUxobljPhI5BflndaCDzQ6uFxeYWQPRSVtRtjfAI qFjU4vtc8Bzv9/866g/RqQtwe6TDrvMn3j4AGB/tvrSA2+fcVAYyFvMcTK8Z7A== 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=1725479911; 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=qL0N96SEHROw8mnF+5YONZGT1lR5btgDbwSySaU2Vl4=; b=UJJxSsL2XlVGAETTbEUcL/78XmLakjlB8ZK+4f9HxDJmbC3ZQtB23+tQYhwT+GdAKkQ3z5 LcZhzW7zfgKVxa6griYbdbzQ4/EFS38BWQB1mCwMxs8vowXEcOaCXad4LsP53F9OfBXsuz lrZHqXKM0tgTU9PjggeB/HifUz/OIJA+ZDSgHEPW/yPh2S0TgmsAvludsGORHn5jNG4QD8 zzc1lAkA97zPLEGW07AysY9P18mAPe+f6+q8DjzrXteILLXfDLU+3oiKG2MYD4oF0PHS5w J/7ACkkei7XZ6e6p/pavSILnclZRkbTNJYHRplieXDkdpzZbg+lRYk6lX9BYnQ== 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 4WzYFy6GbnzdL5; Wed, 4 Sep 2024 19:58:30 +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 484JwURq030327; Wed, 4 Sep 2024 19:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484JwUxC030324; Wed, 4 Sep 2024 19:58:30 GMT (envelope-from git) Date: Wed, 4 Sep 2024 19:58:30 GMT Message-Id: <202409041958.484JwUxC030324@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: 7739dab97433 - releng/13.4 - 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.4 X-Git-Reftype: branch X-Git-Commit: 7739dab974336ed87304cae9240e1c4b963d5280 Auto-Submitted: auto-generated The branch releng/13.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7739dab974336ed87304cae9240e1c4b963d5280 commit 7739dab974336ed87304cae9240e1c4b963d5280 Author: Olivier Certner AuthorDate: 2024-09-04 14:38:12 +0000 Commit: Ed Maste CommitDate: 2024-09-04 19:16:40 +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 Approved by: re (cperciva) --- 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 5d83842f8ed2..23087cf4269e 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -4360,7 +4360,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)); @@ -4408,7 +4408,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)