diff options
| author | Ying Xue <ying.xue@windriver.com> | 2018-02-14 13:38:03 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-14 14:46:33 -0500 |
| commit | 5631f65decf390ae480d157838c0c393a991328e (patch) | |
| tree | ce9a2913e9453290f3cce8295b16549b6093f5e3 | |
| parent | 07ffb22357323c7189921935b24d68018e1a2b68 (diff) | |
| download | op-kernel-dev-5631f65decf390ae480d157838c0c393a991328e.zip op-kernel-dev-5631f65decf390ae480d157838c0c393a991328e.tar.gz | |
tipc: Introduce __tipc_nl_net_set
Introduce __tipc_nl_net_set() which doesn't hold RTNL lock.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/tipc/net.c | 15 | ||||
| -rw-r--r-- | net/tipc/net.h | 1 |
2 files changed, 13 insertions, 3 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index 719c592..1a2fde0 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c @@ -200,7 +200,7 @@ out: return skb->len; } -int tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info) +int __tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info) { struct net *net = sock_net(skb->sk); struct tipc_net *tn = net_generic(net, tipc_net_id); @@ -241,10 +241,19 @@ int tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info) if (!tipc_addr_node_valid(addr)) return -EINVAL; - rtnl_lock(); tipc_net_start(net, addr); - rtnl_unlock(); } return 0; } + +int tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info) +{ + int err; + + rtnl_lock(); + err = __tipc_nl_net_set(skb, info); + rtnl_unlock(); + + return err; +} diff --git a/net/tipc/net.h b/net/tipc/net.h index c7c2549..c0306aa 100644 --- a/net/tipc/net.h +++ b/net/tipc/net.h @@ -47,5 +47,6 @@ void tipc_net_stop(struct net *net); int tipc_nl_net_dump(struct sk_buff *skb, struct netlink_callback *cb); int tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info); +int __tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info); #endif |
