From nobody Wed Sep 4 20:54:24 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 4WzZVT2Wssz5VMvQ; Wed, 04 Sep 2024 20:54:25 +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 4WzZVT0tlqz4QWC; Wed, 4 Sep 2024 20:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725483265; 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=waAnXi0PaRPgaSh0j8+htqIDwyIeHtcXoA+oXYc0j04=; b=oXC5qDA+T3UTsewxXiE3/3iMp8bUa+c8/Z94yEJvtA/v9InX7wth8hjgLTRO53qRwykkSB 4MNqXMfx6QHYP9UVxQZnT4by9z6Ic1lXHcQN5Hr1zMmAxOuhudyGIEjQBeYaFltOGOY4zq gMsYD0pGUpftY8eYMoRCszAhCE1+0MOzzCE9GDrC7Yj2L8M/7A8w9mQhjjJCVtcaVdsnps DQF0UfxvCd+LUkRMetDgzANiQ0rhIQADqb+rEqIWy5GPSTRLuZVaAUab9gVU9aOas1ln2l R0VtxV+r5TBRtkV5z+K9a4zuRa3j1SupmOVltznx40dRYx2h9G754uaZ/dZdQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725483265; a=rsa-sha256; cv=none; b=VF0imE4yfyav8j7TWBYmRB6TG7fnmN7YESZVcsT5lJbZZZRKG3bNcEej9PcEMY6GMnVRKD iAdVPQh5PH5gwpkeCdFpoTRnLsUkeZaI00FUGV8bfoF187CGgHLSsiGpa9QzO4UtKtRHBM 9DQ2RchqRGVNS5qq0M4KNlI/1WGATC8rzNbmj/4OUJFnrH5PqiqeQtSzHuxQN3cWSG+zWN MSin2PYnJ9MLzyOpdAjweb8q7b1Vts53oM++jIlXdhivsuHfpKxH30hMPtTW9S+Vn/gqDc ReZIPIPuFsF1FOsp6ApMkP1cJdz6qlHTv6aLYp7uvb7mhFNxoKyncoe1fMIHPg== 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=1725483265; 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=waAnXi0PaRPgaSh0j8+htqIDwyIeHtcXoA+oXYc0j04=; b=AEbiK9+pbU4i4kOfXNXnrBg+f6TVIxwvt9VrXQtZdvr9h1cpzKAhHGLONqd1ZiAQZlcDF2 YX5pIsSPMm6FkjKilESJlEIvQh9n5SvZyJje2sH2yUB1pJwjdI99UBYMicXfXVgBxPN4aO n2kvfDXqR1eR/azopU5gn1E12X0WyqW/JQU2NNrXrIT3yCfbEMe+SudYwi+PVXKvJe0zM/ EMc9KrcdE9ylnVUTT5PI5LseGnTSrymyQmD0bLQP90tktUHBLMKf2A74oS5SaGNuPN83qz 07aWzjNgBfk6gF2A2Wt8rdYZsQB1gtp79gb/Y+BV8XQxh4QOTwC8bTgnd7biaA== 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 4WzZVT0SfyzgH2; Wed, 4 Sep 2024 20:54:25 +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 484KsOvE034250; Wed, 4 Sep 2024 20:54:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484KsOVZ034247; Wed, 4 Sep 2024 20:54:24 GMT (envelope-from git) Date: Wed, 4 Sep 2024 20:54:24 GMT Message-Id: <202409042054.484KsOVZ034247@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: 37823ca38148 - releng/14.0 - 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.0 X-Git-Reftype: branch X-Git-Commit: 37823ca38148a4b53b373eb0e3a39242ccc4b06d Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=37823ca38148a4b53b373eb0e3a39242ccc4b06d commit 37823ca38148a4b53b373eb0e3a39242ccc4b06d Author: Olivier Certner AuthorDate: 2024-09-04 14:38:12 +0000 Commit: Ed Maste CommitDate: 2024-09-04 20:54:03 +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 d7171a9694f7..d6209c5dd505 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -4338,7 +4338,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)); @@ -4386,7 +4386,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)