diff options
| author | Tonghao Zhang <xiangxia.m.yue@gmail.com> | 2017-11-09 00:03:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-11 19:17:33 +0900 |
| commit | 5290ada4a2e6a9dec00e849a49af8f7bf7462449 (patch) | |
| tree | 13d9566a1641bfb305ce9200203c1b4bef2bcb4d /net/core | |
| parent | 492d070f2495d4b200124ed44a35ab3d8f74ac93 (diff) | |
| download | linux-5290ada4a2e6a9dec00e849a49af8f7bf7462449.tar.gz linux-5290ada4a2e6a9dec00e849a49af8f7bf7462449.tar.bz2 linux-5290ada4a2e6a9dec00e849a49af8f7bf7462449.zip | |
sock: Remove the global prot_inuse counter.
The per-cpu counter for init_net is prepared in core_initcall.
The patch 7d720c3e ("percpu: add __percpu sparse annotations to net")
and d6d9ca0fe ("net: this_cpu_xxx conversions") optimize the
routines. Then remove the old counter.
Cc: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Tonghao Zhang <zhangtonghao@didichuxing.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/sock.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index c59bcf90d905..57bbd6040eb6 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3044,7 +3044,6 @@ struct prot_inuse { static DECLARE_BITMAP(proto_inuse_idx, PROTO_INUSE_NR); -#ifdef CONFIG_NET_NS void sock_prot_inuse_add(struct net *net, struct proto *prot, int val) { __this_cpu_add(net->core.inuse->val[prot->inuse_idx], val); @@ -3088,27 +3087,6 @@ static __init int net_inuse_init(void) } core_initcall(net_inuse_init); -#else -static DEFINE_PER_CPU(struct prot_inuse, prot_inuse); - -void sock_prot_inuse_add(struct net *net, struct proto *prot, int val) -{ - __this_cpu_add(prot_inuse.val[prot->inuse_idx], val); -} -EXPORT_SYMBOL_GPL(sock_prot_inuse_add); - -int sock_prot_inuse_get(struct net *net, struct proto *prot) -{ - int cpu, idx = prot->inuse_idx; - int res = 0; - - for_each_possible_cpu(cpu) - res += per_cpu(prot_inuse, cpu).val[idx]; - - return res >= 0 ? res : 0; -} -EXPORT_SYMBOL_GPL(sock_prot_inuse_get); -#endif static void assign_proto_idx(struct proto *prot) { |