From nobody Fri Jul 21 09:22:11 2023 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 4R6kbS0sZYz4nbvL; Fri, 21 Jul 2023 09:22:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R6kbS0B6Rz3DfM; Fri, 21 Jul 2023 09:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689931332; 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=CpSb9bxvFh/lUnYn56/l4QTqj4hv9ry54NwtFL77DyQ=; b=MSoBkABVoypZ6b2blVJOfRKVWRt5dvP0rnjt1AnPu0znVNwM3ukMQI/uu99LResYrdMgr5 bwzhzMRtjKG3ICtIoRAL1TOMw3axo0NAMqNLsu28L3u1i9+18TI2eixVw1aM3GkBYh+Q+P 65mTCffqnErSwmTBi/NmTTd5hV+pcEI7oH6Hp9wZUvv6XMsjFclihlM1LziiIJ040G8OQa dGNkEO2gGLgJRpfU3EZWscXcTl+leAv5oW2aCrkQoPJR45YMtp8paRz1j7hosRP+VeKcbV ExyNiLubCAo4EdKCFzjjP0WrKxdbHaLLalRCRb2Hv7S6pdD6AYABRAk/Fn4ZPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689931332; 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=CpSb9bxvFh/lUnYn56/l4QTqj4hv9ry54NwtFL77DyQ=; b=qB/a5gSDVOL+0cPDloztSwfMe2n6GD0Lu/yWw1LNYU+l0YBKS6IK1Gc5GOMAuHEogwLIYP 1bWpBD6cIyM5/1kjgcYKOcCzhCXMlwfxA2ZiVoG5kLR/RAph5plozvThONMUuOeBu6SgSR T8Kdi12ratKC0Goyryvd+WjS2vrlA55EqPwsmIbUmd2J4yrE8JxtsD1RZ79UmuC+XvTOP3 CmbpZ7/+y+NJY53xu1vAL10TLQlTHLxG6eLOB19Pj03BHilTXLS+/2o1nx9T1PvZ+QyCFw rTPIejSTnCdEEVN9c2YZB5clkTpf71UbqaTkdBLgQbk/TjA8bWEaczowBIGLTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689931332; a=rsa-sha256; cv=none; b=wPHkOFHf89+/Igd9A/Vhrsh2AtrsmY2y8SUi08zEVWp47yaxPTxK0ykYz7xeony1i1/WN4 tX3X7PfpalZWFHk1sPmG9K71zRhds/Ex9J1y9KgySrUIC0SUlzmylAP8SoZbf2P5mt9x4G vw8nJIpBcGaCv+KbPozBW2BmnmYiv+FGVnkeXoq2yWkX+gtsJasC9lrs00jY8rgaSsA8hs G3t3yP+DjhicUZDjqWOYe2LtRGjFo0ADKcBzP4Mh9Bgpyim3L1BJ80Oy1eBahyOnYpqX7b AYO1x5HV/h+sDUfwidT7E5zvoB/wGjo5Gr1HMqtYlOX3H1LWz0Ncldthb27P/A== 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 4R6kbR6LnBz16rh; Fri, 21 Jul 2023 09:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36L9MBFG094472; Fri, 21 Jul 2023 09:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36L9MB54094471; Fri, 21 Jul 2023 09:22:11 GMT (envelope-from git) Date: Fri, 21 Jul 2023 09:22:11 GMT Message-Id: <202307210922.36L9MB54094471@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d6fedc3f2d37 - stable/13 - vfs: Add a parenthese to vn_lock_pair() asserts to silence gcc 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d6fedc3f2d37a640fa39575a9e5e69d9840a6b68 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d6fedc3f2d37a640fa39575a9e5e69d9840a6b68 commit d6fedc3f2d37a640fa39575a9e5e69d9840a6b68 Author: Dmitry Chagin AuthorDate: 2023-07-19 13:51:07 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-21 09:21:38 +0000 vfs: Add a parenthese to vn_lock_pair() asserts to silence gcc (cherry picked from commit e38c634b77dec76c03613bd84b37ae22d3bb5699) --- sys/kern/vfs_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 628e3aecc864..8f618a9ad46d 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3888,9 +3888,9 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, { int error; - MPASS((lkflags1 & LK_SHARED) != 0 ^ (lkflags1 & LK_EXCLUSIVE) != 0); + MPASS(((lkflags1 & LK_SHARED) != 0) ^ ((lkflags1 & LK_EXCLUSIVE) != 0)); MPASS((lkflags1 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); - MPASS((lkflags2 & LK_SHARED) != 0 ^ (lkflags2 & LK_EXCLUSIVE) != 0); + MPASS(((lkflags2 & LK_SHARED) != 0) ^ ((lkflags2 & LK_EXCLUSIVE) != 0)); MPASS((lkflags2 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); if (vp1 == NULL && vp2 == NULL)