Re: [PATCH 7/8] Remove bogus zero_it argument from sk_alloc

2007-11-01 Thread David Miller 
From: Pavel Emelyanov [EMAIL PROTECTED]
Date: Wed, 31 Oct 2007 16:56:10 +0300

 At this point nobody calls the sk_alloc(() with zero_it == 0,
 so remove unneeded checks from it.
 
 Signed-off-by: Pavel Emelyanov [EMAIL PROTECTED]

Applied.
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 7/8] Remove bogus zero_it argument from sk_alloc

2007-10-31 Thread Pavel Emelyanov 
At this point nobody calls the sk_alloc(() with zero_it == 0,
so remove unneeded checks from it.

Signed-off-by: Pavel Emelyanov [EMAIL PROTECTED]

---

diff --git a/net/core/sock.c b/net/core/sock.c
index c032f48..77575c3 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -931,21 +931,16 @@ struct sock *sk_alloc(struct net *net, int family, gfp_t 
priority,
 {
struct sock *sk;
 
-   if (zero_it)
-   priority |= __GFP_ZERO;
-
-   sk = sk_prot_alloc(prot, priority, family);
+   sk = sk_prot_alloc(prot, priority | __GFP_ZERO, family);
if (sk) {
-   if (zero_it) {
-   sk-sk_family = family;
-   /*
-* See comment in struct sock definition to understand
-* why we need sk_prot_creator -acme
-*/
-   sk-sk_prot = sk-sk_prot_creator = prot;
-   sock_lock_init(sk);
-   sk-sk_net = get_net(net);
-   }
+   sk-sk_family = family;
+   /*
+* See comment in struct sock definition to understand
+* why we need sk_prot_creator -acme
+*/
+   sk-sk_prot = sk-sk_prot_creator = prot;
+   sock_lock_init(sk);
+   sk-sk_net = get_net(net);
}
 
return sk;
-- 
1.5.3.4

-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html