From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tonghao Zhang Subject: [PATCH v6 1/3] sock: Change the netns_core member name. Date: Sun, 10 Dec 2017 07:12:04 -0800 Message-ID: <1512918726-2731-1-git-send-email-xiangxia.m.yue@gmail.com> Cc: netdev@vger.kernel.org, Tonghao Zhang To: davem@davemloft.net, xiyou.wangcong@gmail.com, edumazet@google.com, willemb@google.com, xemul@openvz.org Return-path: Received: from mail-pl0-f66.google.com ([209.85.160.66]:34622 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751633AbdLJPMt (ORCPT ); Sun, 10 Dec 2017 10:12:49 -0500 Received: by mail-pl0-f66.google.com with SMTP id d21so3089603pll.1 for ; Sun, 10 Dec 2017 07:12:49 -0800 (PST) Sender: netdev-owner@vger.kernel.org List-ID: Change the member name will make the code more readable. This patch will be used in next patch. Signed-off-by: Martin Zhang Signed-off-by: Tonghao Zhang --- include/net/netns/core.h | 2 +- net/core/sock.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/net/netns/core.h b/include/net/netns/core.h index 0ad4d0c..45cfb5d 100644 --- 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 c0b5b2f..c2dd2d3 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3045,7 +3045,7 @@ struct prot_inuse { 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 @@ int sock_prot_inuse_get(struct net *net, struct proto *prot) 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 = { -- 1.8.3.1