git: 1605eaa6d23e - main - ipfilter: Locking sysctls here is not required

Cy Schubert cy at FreeBSD.org
Fri Sep 24 18:41:29 UTC 2021


The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=1605eaa6d23ea5161b5ab8461e83ab32a591a4fc

commit 1605eaa6d23ea5161b5ab8461e83ab32a591a4fc
Author:     Cy Schubert <cy at FreeBSD.org>
AuthorDate: 2021-09-24 18:18:42 +0000
Commit:     Cy Schubert <cy at FreeBSD.org>
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);
 }
 


More information about the dev-commits-src-all mailing list