summaryrefslogtreecommitdiffstats
path: root/security/smack/smack_netfilter.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-03-27 13:18:10 -0400
committerDavid S. Miller <davem@davemloft.net>2018-03-27 13:18:10 -0400
commitc709002c23f91d90eb6ee2d4efbb548a8fe3cc80 (patch)
treedc2887c1b2089055ad7c2d13df0ea20b3a27969b /security/smack/smack_netfilter.c
parentcdcfeb0fb473e34e012b9a78b5cb377a6ad1434d (diff)
parent8518e9bb98b602eca0717d5aaad63ccbe56539d2 (diff)
downloadlinux-c709002c23f91d90eb6ee2d4efbb548a8fe3cc80.tar.gz
linux-c709002c23f91d90eb6ee2d4efbb548a8fe3cc80.tar.bz2
linux-c709002c23f91d90eb6ee2d4efbb548a8fe3cc80.zip
Merge branch 'pernet-all-async'
Kirill Tkhai says: ==================== Make pernet_operations always read locked All the pernet_operations are converted, and the last one is in this patchset (nfsd_net_ops acked by J. Bruce Fields). So, it's the time to kill pernet_operations::async field, and make setup_net() and cleanup_net() always require the rwsem only read locked. All further pernet_operations have to be developed to fit this rule. Some of previous patches added a comment to struct pernet_operations about that. Also, this patchset renames net_sem to pernet_ops_rwsem to make the target area of the rwsem is more clear visible, and adds more comments. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/smack/smack_netfilter.c')
-rw-r--r--security/smack/smack_netfilter.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/security/smack/smack_netfilter.c b/security/smack/smack_netfilter.c
index 3f29c03162ca..e36d17835d4f 100644
--- a/security/smack/smack_netfilter.c
+++ b/security/smack/smack_netfilter.c
@@ -89,7 +89,6 @@ static void __net_exit smack_nf_unregister(struct net *net)
static struct pernet_operations smack_net_ops = {
.init = smack_nf_register,
.exit = smack_nf_unregister,
- .async = true,
};
static int __init smack_nf_ip_init(void)