From owner-dev-commits-src-main@freebsd.org Fri Sep 24 18:41:29 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0F0E86725A7; Fri, 24 Sep 2021 18:41:29 +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 4HGLTh6K8Vz3k2H; Fri, 24 Sep 2021 18:41:28 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B6E561BC8F; Fri, 24 Sep 2021 18:41:28 +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 18OIfSPn002077; Fri, 24 Sep 2021 18:41:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18OIfSfb002076; Fri, 24 Sep 2021 18:41:28 GMT (envelope-from git) Date: Fri, 24 Sep 2021 18:41:28 GMT Message-Id: <202109241841.18OIfSfb002076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 1605eaa6d23e - main - ipfilter: Locking sysctls here is not required MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1605eaa6d23ea5161b5ab8461e83ab32a591a4fc Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Sep 2021 18:41:29 -0000 The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1605eaa6d23ea5161b5ab8461e83ab32a591a4fc commit 1605eaa6d23ea5161b5ab8461e83ab32a591a4fc Author: Cy Schubert AuthorDate: 2021-09-24 18:18:42 +0000 Commit: Cy Schubert CommitDate: 2021-09-24 18:41:02 +0000 ipfilter: Locking sysctls here is not required Locking of data structures touched by sysctls is more finely locked in ipflter therefore higher level locks are redundant. MFC after: 3 days --- sys/contrib/ipfilter/netinet/mlfk_ipl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c index 64beb1448858..8d9cb780b9e8 100644 --- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c +++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c @@ -349,7 +349,6 @@ sysctl_ipf_int ( SYSCTL_HANDLER_ARGS ) { int error = 0; - WRITE_ENTER(&V_ipfmain.ipf_mutex); if (arg1) error = SYSCTL_OUT(req, arg1, sizeof(int)); else @@ -368,7 +367,6 @@ sysctl_ipf_int ( SYSCTL_HANDLER_ARGS ) } sysctl_error: - RWLOCK_EXIT(&V_ipfmain.ipf_mutex); return (error); }