Home » Mailing list archives » linux-netdev » 2007 » October » 31

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

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Pavel Emelyanov <xemul@...>
To: David Miller <davem@...>
Cc: Linux Netdev List <netdev@...>, <devel@...>
Subject: [PATCH 7/8] Remove bogus zero_it argument from sk_alloc
Date: Wednesday, October 31, 2007 - 9:56 am

At this point nobody calls the sk_alloc(() with zero_it == 0,
so remove unneeded checks from it.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

---

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 majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/8] Cleanup/fix the sk_alloc() call, Pavel Emelyanov, (Wed Oct 31, 9:40 am)
Re: [PATCH 0/8] Cleanup/fix the sk_alloc() call, Arnaldo Carvalho de Melo, (Wed Oct 31, 9:15 am)
Re: [PATCH 0/8] Cleanup/fix the sk_alloc() call, Pavel Emelyanov, (Wed Oct 31, 10:32 am)
Re: [PATCH 0/8] Cleanup/fix the sk_alloc() call, Arnaldo Carvalho de Melo, (Wed Oct 31, 10:14 am)
[PATCH 8/8] Forget the zero_it argument of sk_alloc(), Pavel Emelyanov, (Wed Oct 31, 9:59 am)
Re: [PATCH 8/8] Forget the zero_it argument of sk_alloc(), David Miller, (Thu Nov 1, 3:41 am)
[PATCH 7/8] Remove bogus zero_it argument from sk_alloc, Pavel Emelyanov, (Wed Oct 31, 9:56 am)
Re: [PATCH 7/8] Remove bogus zero_it argument from sk_alloc, David Miller, (Thu Nov 1, 3:38 am)
[PATCH 6/8] Make the sk_clone() lighter, Pavel Emelyanov, (Wed Oct 31, 9:54 am)
Re: [PATCH 6/8] Make the sk_clone() lighter, David Miller, (Thu Nov 1, 3:38 am)
Re: [PATCH 6/8] Make the sk_clone() lighter, David Miller, (Thu Nov 1, 3:26 am)
Re: [PATCH 6/8] Make the sk_clone() lighter, Pavel Emelyanov, (Thu Nov 1, 4:46 am)
[PATCH 5/8] Move some core sock setup into sk_prot_alloc, Pavel Emelyanov, (Wed Oct 31, 9:51 am)
Re: [PATCH 5/8] Move some core sock setup into sk_prot_alloc, David Miller, (Thu Nov 1, 3:36 am)
[PATCH 4/8] Auto-zero the allocated sock object, Pavel Emelyanov, (Wed Oct 31, 9:48 am)
Re: [PATCH 4/8] Auto-zero the allocated sock object, David Miller, (Thu Nov 1, 3:35 am)
[PATCH 3/8] Cleanup the allocation/freeing of the sock object, Pavel Emelyanov, (Wed Oct 31, 9:47 am)
Re: [PATCH 3/8] Cleanup the allocation/freeing of the sock o..., David Miller, (Thu Nov 1, 3:34 am)
[PATCH 2/8] Move the get_net() from sock_copy(), Pavel Emelyanov, (Wed Oct 31, 9:44 am)
Re: [PATCH 2/8] Move the get_net() from sock_copy(), David Miller, (Thu Nov 1, 3:32 am)
[PATCH 1/8] Move the sock_copy() from the header, Pavel Emelyanov, (Wed Oct 31, 9:42 am)
Re: [PATCH 1/8] Move the sock_copy() from the header, David Miller, (Thu Nov 1, 3:30 am)