From owner-svn-src-stable-12@freebsd.org  Sat Mar 23 07:07:45 2019
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC57115354DC;
 Sat, 23 Mar 2019 07:07:45 +0000 (UTC) (envelope-from kp@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)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 6BDA882CFC;
 Sat, 23 Mar 2019 07:07:45 +0000 (UTC) (envelope-from kp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 384F74DA6;
 Sat, 23 Mar 2019 07:07:45 +0000 (UTC) (envelope-from kp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2N77jBf083787;
 Sat, 23 Mar 2019 07:07:45 GMT (envelope-from kp@FreeBSD.org)
Received: (from kp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2N77jDF083786;
 Sat, 23 Mar 2019 07:07:45 GMT (envelope-from kp@FreeBSD.org)
Message-Id: <201903230707.x2N77jDF083786@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kp set sender to kp@FreeBSD.org
 using -f
From: Kristof Provost <kp@FreeBSD.org>
Date: Sat, 23 Mar 2019 07:07:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r345440 - stable/12/sys/netpfil/pf
X-SVN-Group: stable-12
X-SVN-Commit-Author: kp
X-SVN-Commit-Paths: stable/12/sys/netpfil/pf
X-SVN-Commit-Revision: 345440
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 6BDA882CFC
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.95 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
 NEURAL_HAM_SHORT(-0.95)[-0.947,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
 NEURAL_HAM_LONG(-1.00)[-1.000,0]
X-BeenThere: svn-src-stable-12@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
 <svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Mar 2019 07:07:46 -0000

Author: kp
Date: Sat Mar 23 07:07:44 2019
New Revision: 345440
URL: https://svnweb.freebsd.org/changeset/base/345440

Log:
  MFC r345223:
  
  pf: Rename pfsync bucket lock
  
  Previously the main pfsync lock and the bucket locks shared the same name.
  This lead to spurious warnings from WITNESS like this:
  
      acquiring duplicate lock of same type: "pfsync"
       1st pfsync @ /usr/src/sys/netpfil/pf/if_pfsync.c:1402
       2nd pfsync @ /usr/src/sys/netpfil/pf/if_pfsync.c:1429
  
  It's perfectly okay to grab both the main pfsync lock and a bucket lock at the
  same time.
  
  We don't need different names for each bucket lock, because we should always
  only acquire a single one of those at a time.

Modified:
  stable/12/sys/netpfil/pf/if_pfsync.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netpfil/pf/if_pfsync.c
==============================================================================
--- stable/12/sys/netpfil/pf/if_pfsync.c	Sat Mar 23 07:07:41 2019	(r345439)
+++ stable/12/sys/netpfil/pf/if_pfsync.c	Sat Mar 23 07:07:44 2019	(r345440)
@@ -363,7 +363,7 @@ pfsync_clone_create(struct if_clone *ifc, int unit, ca
 	    M_PFSYNC, M_ZERO | M_WAITOK);
 	for (c = 0; c < pfsync_buckets; c++) {
 		b = &sc->sc_buckets[c];
-		mtx_init(&b->b_mtx, pfsyncname, NULL, MTX_DEF);
+		mtx_init(&b->b_mtx, "pfsync bucket", NULL, MTX_DEF);
 
 		b->b_id = c;
 		b->b_sc = sc;