Skip to content

Commit

Permalink
sock: Change the netns_core member name.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tonghao Zhang authored and David S. Miller committed Dec 19, 2017
1 parent 962b582 commit 08fc7f8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion include/net/netns/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ struct netns_core {

int sysctl_somaxconn;

struct prot_inuse __percpu *inuse;
struct prot_inuse __percpu *prot_inuse;
};

#endif
10 changes: 5 additions & 5 deletions net/core/sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -3055,21 +3055,21 @@ 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;
}
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 = {
Expand Down

0 comments on commit 08fc7f8

Please sign in to comment.