summaryrefslogtreecommitdiffstats
path: root/include/linux/rtnetlink.h
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 /include/linux/rtnetlink.h
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 'include/linux/rtnetlink.h')
-rw-r--r--include/linux/rtnetlink.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 562a175c35a9..c7d1e4689325 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -36,7 +36,7 @@ extern int rtnl_is_locked(void);
extern int rtnl_lock_killable(void);
extern wait_queue_head_t netdev_unregistering_wq;
-extern struct rw_semaphore net_sem;
+extern struct rw_semaphore pernet_ops_rwsem;
#ifdef CONFIG_PROVE_LOCKING
extern bool lockdep_rtnl_is_held(void);