From nobody Wed Sep 04 16:00:58 2024 X-Original-To: dev-commits-src-all@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 4WzRzv35ntz5V8Mp; Wed, 04 Sep 2024 16:00:59 +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 4WzRzv1Crvz4YBx; Wed, 4 Sep 2024 16:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725465659; 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=koM6xc/BcANmrUFf+pDVs0lfSHwDim3YuBYtgrqwwag=; b=pbSDOb1Cd6gDdS3F+nkrOWTKY4z/D4tEOa9iHD0IpjftIwqK3cKStmMaJNJnGVJNPsJBpZ kAuCCMmMUCpI40W4vsDF8tYmENYNguu3u3oc+j0lNGLPlnHLUfe5QTydY1fekpPy6BYzYW 8IAeG5km/Zx4zZsuQqEy94SGo4ocB4TNppuGwINBHEIlpQdpnhgD6fPqqgOZfiByS93vbp pJc2+7WJc4qyFliT/StY9Ov6VbMRsJI2xLCDSWA0Aw/OsR7zsPAfCTAcQYe2u94HdhawaF lTJfcrRvzE+BSiFHoDv3a4nPxViqQV2AUY5E0JQT6o1pcvLsUNu7r9m0DbybdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725465659; a=rsa-sha256; cv=none; b=eHkdFStQ4eShHBhcAUdBVIV0pJyrJuQAj6x3RKqg3XhdSxEZIkTgmVWgLDicFYsX0reiBc wCncDN5jVlfFeMU2PJfMKR8x8EWRZklk3UMvUUUGCYssLLra1YXkGQFkgbVCsg1lxPzT5c G0HO7/WJkpHoD8icqDRdxKW2+BitU3qv5mkDLbfEzg9m9yKz1ykQjjD5qcGI3BV8VwthmH ik/Q/JBHnnyl1C59riEA9zsVBvvP7NXxyIYh2DPqLuN6qU037aR8+aUlVpmXekPzlrXnvu eGbRMTkYAqzITbVdZ/p2YJZ1pBMyZ5ymSW5et2aceIaVsaKcoDcBA8+d2wwjNw== 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=1725465659; 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=koM6xc/BcANmrUFf+pDVs0lfSHwDim3YuBYtgrqwwag=; b=PDIufuWj4GEkj867cgTeVe0WnWjjqqNmmxHMnc/yKIgXRt9PgVSRxLFR9lED2aZBKYtp2X DEylv4XXTtupBI1w/siw3hpm9p/+ohGQ+uF+RMXAuuL8g/ZXPIZcDjNF/ziVTcFLE0O7vX zwsBIIrJZW6NYOpoqCK5yhmRQDfQztUHdjl2ztkSCufgChVCiE4u+aw83qZP6F8uAygv8p egaw7Vtb6JylIfCC5LsNWZUt38hr/jbib6oeEGLwKUZYVXZJY0k53pw6+mWS5mT9yZV6P4 96Dnes7oNyak2h0ezOumPQMQeBYwApR6OKwnJFcK/kyWgj5OV8kpoqJ0xi6mOA== 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 4WzRzv0NmxzX1L; Wed, 4 Sep 2024 16:00:59 +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 484G0wam031936; Wed, 4 Sep 2024 16:00:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484G0wMT031933; Wed, 4 Sep 2024 16:00:58 GMT (envelope-from git) Date: Wed, 4 Sep 2024 16:00:58 GMT Message-Id: <202409041600.484G0wMT031933@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: 4938f554469b - stable/14 - umtx: shm: 'ushm_refcnt > 0' => 'ushm_refcnt != 0' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 4938f554469bc81783998143968ec3eba2a43def Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4938f554469bc81783998143968ec3eba2a43def commit 4938f554469bc81783998143968ec3eba2a43def Author: Olivier Certner AuthorDate: 2024-09-04 14:38:12 +0000 Commit: Ed Maste CommitDate: 2024-09-04 15:00:56 +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) --- 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)