X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fsunrpc%2Fsvcsock.c;h=a27905a0ad277a4322d291e333c479794e3383de;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=425ec7ffc438235664d127fdd46b074a68485ce8;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 425ec7ffc..a27905a0a 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -73,37 +73,6 @@ static struct svc_deferred_req *svc_deferred_dequeue(struct svc_sock *svsk);
 static int svc_deferred_recv(struct svc_rqst *rqstp);
 static struct cache_deferred_req *svc_defer(struct cache_req *req);
 
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-static struct lock_class_key svc_key[2];
-static struct lock_class_key svc_slock_key[2];
-
-static inline void svc_reclassify_socket(struct socket *sock)
-{
-	struct sock *sk = sock->sk;
-	BUG_ON(sk->sk_lock.owner != NULL);
-	switch (sk->sk_family) {
-		case AF_INET:
-			sock_lock_init_class_and_name(sk,
-				"slock-AF_INET-NFSD", &svc_slock_key[0],
-				"sk_lock-AF_INET-NFSD", &svc_key[0]);
-			break;
-
-		case AF_INET6:
-			sock_lock_init_class_and_name(sk,
-				"slock-AF_INET6-NFSD", &svc_slock_key[1],
-				"sk_lock-AF_INET6-NFSD", &svc_key[1]);
-			break;
-
-		default:
-			BUG();
-	}
-}
-#else
-static inline void svc_reclassify_socket(struct socket *sock)
-{
-}
-#endif
-
 /*
  * Queue up an idle server thread.  Must have serv->sv_lock held.
  * Note: this is really a stack rather than a queue, so that we only
@@ -933,7 +902,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
 		return 0;
 	}
 
-	if (svsk->sk_sk->sk_state == TCP_LISTEN) {
+	if (test_bit(SK_CONN, &svsk->sk_flags)) {
 		svc_tcp_accept(svsk);
 		svc_sock_received(svsk);
 		return 0;
@@ -1353,10 +1322,11 @@ svc_setup_socket(struct svc_serv *serv, struct socket *sock,
 	struct sock	*inet;
 
 	dprintk("svc: svc_setup_socket %p\n", sock);
-	if (!(svsk = kzalloc(sizeof(*svsk), GFP_KERNEL))) {
+	if (!(svsk = kmalloc(sizeof(*svsk), GFP_KERNEL))) {
 		*errp = -ENOMEM;
 		return NULL;
 	}
+	memset(svsk, 0, sizeof(*svsk));
 
 	inet = sock->sk;
 
@@ -1434,8 +1404,6 @@ svc_create_socket(struct svc_serv *serv, int protocol, struct sockaddr_in *sin)
 	if ((error = sock_create_kern(PF_INET, type, protocol, &sock)) < 0)
 		return error;
 
-	svc_reclassify_socket(sock);
-
 	if (sin != NULL) {
 		if (type == SOCK_STREAM)
 			sock->sk->sk_reuse = 1; /* allow address reuse */