From nobody Wed Sep 4 16:05:17 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 4WzS4s4MVSz5V9N2; Wed, 04 Sep 2024 16:05:17 +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 4WzS4s2Q10z4bkf; Wed, 4 Sep 2024 16:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725465917; 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=aagOR/76C/ZivaWiCKtVGvVpWqxVb5TxmcNGfB0bxVM=; b=A6pxIR+WU3N/IR8QGBJDWuJE40lYI3+LEdOdeF8I3GzyX7cYJJ/8c7n15afkg6yZHe/FHl Nq6VVaIiC4qMLrP7vTi9wI7ov8t5QRAX5L/Zgu+cgjwBtMP6zN+aW8aocriuyk87fdZyVH nYmri32JgssXxn44qXsAaPyLRPS24DB+AeevkkWlw1sIzpZ5D7T2GEvFRMyTw/cE30jwhb hW6JHM9JGnhcktXl6dkr1KDjQK+I6ac4bVWHoACRdCikvQDo0gaSWgbNc5SqTH3iYnxHyd ABzYEHWrRNfCPbTj4LMrt80Th0An7oPrHadB852m4Fs4R1dLd7zUD+Ps9q9HEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725465917; a=rsa-sha256; cv=none; b=WtSXBLIKAq/aex7Ee1Bh6V92z6VMo1uFvNRxg0g8qhmra/HBDDescoo4CK6OMLf52Is/PH jR+O0Li0HHq4LASn6A3wQc2MxhO5NBP+vsHM6DTwxJ4HNfmQxCno4rWh2Ugm5vMio1Dtyw pRKZmohEtNuWFO8wLLQhKqfvfSoCYKhoDoR0ODSr4MMybhurNnPagp5Rhh9yzExvAn9Fou e0xIIwCQ6ysP20omJnVkDxue/zvRD1oZkIZruw0cb2XgYc6n7L/DvS2kusraNyFop8wEpk b2UVk6iTb48aLWKp3Z6i8z0qWHPrwWoxpGljWYCa5qMONZzCjL/pGrwETfy18g== 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=1725465917; 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=aagOR/76C/ZivaWiCKtVGvVpWqxVb5TxmcNGfB0bxVM=; b=q7pguaFTB6dXc0RPNVCv7KXgd2L/vl4vzkCNYk8P7pznU0U4pgghc7w4NogICBBqusyBQr EnMdmv3yWlAP7PijETXphGldnHM6iVzD0JHo9X+UqgbBaPPe7GpVA7embcgbYwWoS0DyPO 0zZoFTx3Qx8fnsu7K2ZoBgj2f5GW8cCR2l7GrmlewzltqszT/3b++lZVo8iCEexHhnyE2s eSx3ziw1bb0OOO4CeOxDxqnqKxqaaIXrMYwoIfNeASpjVEjKDAipnJSNEsExbYLM3EELWR QJ/dCak/vhZyTnBqLDIaRjaKKYbSBv30zbV7tihHlcpghTJ0poNSXhQqvEXpPg== 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 4WzS4s190bzWm4; Wed, 4 Sep 2024 16:05:17 +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 484G5HMS039626; Wed, 4 Sep 2024 16:05:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484G5H3R039623; Wed, 4 Sep 2024 16:05:17 GMT (envelope-from git) Date: Wed, 4 Sep 2024 16:05:17 GMT Message-Id: <202409041605.484G5H3R039623@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: a73a70472c47 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: a73a70472c47877d57d090ef77ae503fe75e9f41 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a73a70472c47877d57d090ef77ae503fe75e9f41 commit a73a70472c47877d57d090ef77ae503fe75e9f41 Author: Olivier Certner AuthorDate: 2024-09-04 14:38:12 +0000 Commit: Ed Maste CommitDate: 2024-09-04 16:02:43 +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) --- 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)