From d30fb702a84cbf1e75dc176d0aee8d50e54cff17 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Thu, 1 Nov 2007 00:29:45 -0700
Subject: [PATCH] --- yaml --- r: 72971 b: refs/heads/master c:
 f1a6c4da14c365d3ee0b5de43a93f7470982637c h: refs/heads/master i:   72969:
 f66cdaf6d271dfaee01f73ecffa48a4bc7d247e6   72967:
 1d006692770c50110c8665c7c22697388db97813 v: v3

---
 [refs]                   |  2 +-
 trunk/include/net/sock.h | 14 --------------
 trunk/net/core/sock.c    | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 049dd9b90175..9ddf019b2c3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 261ab365fadd53ddc1b292b1663800e11fbf3e71
+refs/heads/master: f1a6c4da14c365d3ee0b5de43a93f7470982637c
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 43fc3fa50d62..ecad7b4e2a63 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -993,20 +993,6 @@ static inline void sock_graft(struct sock *sk, struct socket *parent)
 	write_unlock_bh(&sk->sk_callback_lock);
 }
 
-static inline void sock_copy(struct sock *nsk, const struct sock *osk)
-{
-#ifdef CONFIG_SECURITY_NETWORK
-	void *sptr = nsk->sk_security;
-#endif
-
-	memcpy(nsk, osk, osk->sk_prot->obj_size);
-	get_net(nsk->sk_net);
-#ifdef CONFIG_SECURITY_NETWORK
-	nsk->sk_security = sptr;
-	security_sk_clone(osk, nsk);
-#endif
-}
-
 extern int sock_i_uid(struct sock *sk);
 extern unsigned long sock_i_ino(struct sock *sk);
 
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index bba9949681ff..fdacf9c8f1cb 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -857,6 +857,20 @@ static inline void sock_lock_init(struct sock *sk)
 			af_family_keys + sk->sk_family);
 }
 
+static void sock_copy(struct sock *nsk, const struct sock *osk)
+{
+#ifdef CONFIG_SECURITY_NETWORK
+	void *sptr = nsk->sk_security;
+#endif
+
+	memcpy(nsk, osk, osk->sk_prot->obj_size);
+	get_net(nsk->sk_net);
+#ifdef CONFIG_SECURITY_NETWORK
+	nsk->sk_security = sptr;
+	security_sk_clone(osk, nsk);
+#endif
+}
+
 /**
  *	sk_alloc - All socket objects are allocated here
  *	@net: the applicable net namespace