提交 154adbc8 编写于 作者: P Pavel Emelyanov 提交者: David S. Miller

[NET]: Remove bogus zero_it argument from sk_alloc

At this point nobody calls the sk_alloc(() with zero_it == 0,
so remove unneeded checks from it.
Signed-off-by: NPavel Emelyanov <xemul@openvz.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 8fd1d178
...@@ -931,21 +931,16 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority, ...@@ -931,21 +931,16 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t priority,
{ {
struct sock *sk; struct sock *sk;
if (zero_it) sk = sk_prot_alloc(prot, priority | __GFP_ZERO, family);
priority |= __GFP_ZERO;
sk = sk_prot_alloc(prot, priority, family);
if (sk) { if (sk) {
if (zero_it) { sk->sk_family = family;
sk->sk_family = family; /*
/* * See comment in struct sock definition to understand
* See comment in struct sock definition to understand * why we need sk_prot_creator -acme
* why we need sk_prot_creator -acme */
*/ sk->sk_prot = sk->sk_prot_creator = prot;
sk->sk_prot = sk->sk_prot_creator = prot; sock_lock_init(sk);
sock_lock_init(sk); sk->sk_net = get_net(net);
sk->sk_net = get_net(net);
}
} }
return sk; return sk;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册