From nobody Tue Apr 18 13:51:38 2023 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 4Q151k65Dkz4585c; Tue, 18 Apr 2023 13:51:38 +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 4Q151k4thHz3kpq; Tue, 18 Apr 2023 13:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681825898; 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=zs+gSYZ2RukywcgMz/6/+t3osPf/rrVUV4CVROyruM8=; b=KaTGQOZyUyLvyTCNNDy8vuRwfP2GOt/YL3DIRQSdNFDUIgrF+Av4G/eym0eMxiBRKY5Pt0 EQzGR7dKxhDs1ttfn9Zzw3BvCnEAA9v2ri0H1zj+7/40CZTQNYRwROT+rPIwO5WfbXqYuD p9+iPsO4zLwQTFLkj9ne5/wh061h+QvsUEfrQfC0csHUDdMcViaCxu/SnVOtaRlPgv+Rae 12QUrOtkmKTd1XsK2fpeNs6RYx/l0Qn/z4OtanUUAIrakkYHu/RZDwK5oOrESQ97xv9FyP avrVxdEVNDtU16oQZGexR3fb67uCewXUGrZEbWZ2OD8KkiiyhxTRLw3UskmY3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681825898; 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=zs+gSYZ2RukywcgMz/6/+t3osPf/rrVUV4CVROyruM8=; b=N9YsBQh4mFwLKks4hfpevsDP+1b6YLLPwjoHFUGOqdepW2ODct+BHftB+C5TS9WeQbhx4r 2TctapDg7Zog8rAJt0XtDIQKVSgcuwdQBoe5H1j/6GlteydtsaNriEKs9KMfJq6IXZuSKC oDiujmjGTfMveN5K7TBKADCKigTu5FWOGRIi4MQzgjkAuUNATzxY8dBUDdaNLr+pm0BBxB mC6M9blMk7dd1i2ODUEwaEhfX2yN7LlD42CvzlR3+kdVVI0eGj0h6OVaE74lHbOwWNKtYB oRrEdpcXgM/UKqE2BSBJTCf8ag1BIKugFdXnURWD7y4L5naPxlzHANVjEzCL2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681825898; a=rsa-sha256; cv=none; b=cO/klCbaMCZWFb8X+hE3zsAeG2GClcnXY7t0I4/XZG/4Z6HbTSXnThTYHfcUQBXZQPgdG2 SE2Fz16cpNmnc/4v1vs0pogAMqQNhp34Gp0nH1dYzZ/guDLECPAZjutlEnVOeSUZDd13+c rQr59x+Hhil4LIN2iEZEVFLJjfvLLEBIv+pErGVX5YfeNpMU+eZ8bDBRZftymoStg5TXiQ 4E7hgRaUBkqrRAd1TcytxjM2xQOXPvwmw4wvJ6MslVUGmEdGdKhxYDsrxE7gDnM+klhcG6 jNy9D5Xv69QtrGaJD9GkRwLAs8Tz74H1iuOT5/pzIlgscOGEW8kM/Wgv85sfjw== 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 4Q151k3mc4zF7H; Tue, 18 Apr 2023 13:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33IDpc1M056907; Tue, 18 Apr 2023 13:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33IDpcS9056906; Tue, 18 Apr 2023 13:51:38 GMT (envelope-from git) Date: Tue, 18 Apr 2023 13:51:38 GMT Message-Id: <202304181351.33IDpcS9056906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: af94d8cc1716 - main - pf: fix incorrect lock define 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af94d8cc17164e2558fc97abdfbaeb550cd337b6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=af94d8cc17164e2558fc97abdfbaeb550cd337b6 commit af94d8cc17164e2558fc97abdfbaeb550cd337b6 Author: Kristof Provost AuthorDate: 2023-04-18 13:24:24 +0000 Commit: Kristof Provost CommitDate: 2023-04-18 13:51:05 +0000 pf: fix incorrect lock define PF_TABLE_STATS_ASSERT() should be checking pf_table_stats_lock not pf_rules_lock. Fortunately the define is not yet used anywhere so this was harmless. Fix it anyway, in case it does get used. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index e2cddb49728c..e9e23d985cfa 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -400,7 +400,7 @@ extern struct mtx_padalign pf_table_stats_lock; #define PF_TABLE_STATS_LOCK() mtx_lock(&pf_table_stats_lock) #define PF_TABLE_STATS_UNLOCK() mtx_unlock(&pf_table_stats_lock) #define PF_TABLE_STATS_OWNED() mtx_owned(&pf_table_stats_lock) -#define PF_TABLE_STATS_ASSERT() mtx_assert(&pf_rules_lock, MA_OWNED) +#define PF_TABLE_STATS_ASSERT() mtx_assert(&pf_table_stats_lock, MA_OWNED) extern struct sx pf_end_lock;