sock: Change the netns_core member name.

Change the member name will make the code more readable.
This patch will be used in next patch.

Signed-off-by: Martin Zhang <zhangjunweimartin@didichuxing.com>
Signed-off-by: Tonghao Zhang <zhangtonghao@didichuxing.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/netns/core.h b/include/net/netns/core.h
index 0ad4d0c71228aeabab489fff48c782bb58aca246..45cfb5dc76c7950dea195adeab278cdeb4bc4fa3 100644 (file)
--- a/include/net/netns/core.h
+++ b/include/net/netns/core.h
@@ -11,7 +11,7 @@ struct netns_core {
 
        int     sysctl_somaxconn;
 
-       struct prot_inuse __percpu *inuse;
+       struct prot_inuse __percpu *prot_inuse;
 };
 
 #endif

diff --git a/net/core/sock.c b/net/core/sock.c
index c0b5b2f17412ec3ac3d4b1cf400fb2fbcabf086f..c2dd2d339db722da3d852b31ce8d4588d85a3d0f 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3045,7 +3045,7 @@ static DECLARE_BITMAP(proto_inuse_idx, PROTO_INUSE_NR);
 
 void sock_prot_inuse_add(struct net *net, struct proto *prot, int val)
 {
-       __this_cpu_add(net->core.inuse->val[prot->inuse_idx], val);
+       __this_cpu_add(net->core.prot_inuse->val[prot->inuse_idx], val);
 }
 EXPORT_SYMBOL_GPL(sock_prot_inuse_add);
 
@@ -3055,7 +3055,7 @@ int sock_prot_inuse_get(struct net *net, struct proto *prot)
        int res = 0;
 
        for_each_possible_cpu(cpu)
-               res += per_cpu_ptr(net->core.inuse, cpu)->val[idx];
+               res += per_cpu_ptr(net->core.prot_inuse, cpu)->val[idx];
 
        return res >= 0 ? res : 0;
 }
@@ -3063,13 +3063,13 @@ EXPORT_SYMBOL_GPL(sock_prot_inuse_get);
 
 static int __net_init sock_inuse_init_net(struct net *net)
 {
-       net->core.inuse = alloc_percpu(struct prot_inuse);
-       return net->core.inuse ? 0 : -ENOMEM;
+       net->core.prot_inuse = alloc_percpu(struct prot_inuse);
+       return net->core.prot_inuse ? 0 : -ENOMEM;
 }
 
 static void __net_exit sock_inuse_exit_net(struct net *net)
 {
-       free_percpu(net->core.inuse);
+       free_percpu(net->core.prot_inuse);
 }
 
 static struct pernet_operations net_inuse_ops = {