knfsd: centralise SK_CONN handling

Index: linux/include/linux/sunrpc/svcsock.h
===================================================================
@@ -43,6 +43,10 @@ struct svc_sock_ops {
 	 * svc_sock.
 	 */
 	u32			(*sko_max_payload)(struct svc_sock *);
+	/*
+	 * Accept a pending connection, for connection-oriented transports
+	 */
+	int			(*sko_accept)(struct svc_sock *svsk);
 };
 
 /*

@@ -147,4 +151,24 @@ static inline void svc_sock_delete_bh(st
 	svc_sock_enqueue(svsk);
 }
 
+/*
+ * For transport-specific code, to be called to clear the
+ * state that would otherwise result in a call to sko_accept.
+ */
+static inline void svc_sock_clear_connection_ready(struct svc_sock *svsk)
+{
+	clear_bit(SK_CONN, &svsk->sk_flags);
+}
+
+/*
+ * For transport-specific code, to be called on asynchronous
+ * notification of a connection attempt on a rendezvous socket.
+ * svc_sock_enqueue() should be called to enqueue the svc_sock
+ * so that an nfsd will eventually come along and call sko_accept.
+ */
+static inline void svc_sock_set_connection_ready(struct svc_sock *svsk)
+{
+	set_bit(SK_CONN, &svsk->sk_flags);
+}
+
 #endif /* SUNRPC_SVCSOCK_H */

Index: linux/net/sunrpc/svcsock.c
===================================================================
@@ -919,6 +919,7 @@ static const struct svc_sock_ops svc_udp
 	.sko_prepare_reply = svc_tcpip_prepare_reply,
 	.sko_has_wspace = svc_udp_has_wspace,
 	.sko_max_payload = svc_udp_max_payload
+	/* no .sko_accept, obviously */
 };
 
 static void

@@ -974,7 +975,7 @@ svc_tcp_listen_data_ready(struct sock *s
 	 */
 	if (sk->sk_state == TCP_LISTEN) {
 		if (svsk) {
-			set_bit(SK_CONN, &svsk->sk_flags);
+			svc_sock_set_connection_ready(svsk);
 			svc_sock_enqueue(svsk);
 		} else
 			printk("svc: socket %p: no user data\n", sk);

@@ -1036,7 +1037,7 @@ static inline int svc_port_is_privileged
 /*
  * Accept a TCP connection
  */
-static void
+static int
 svc_tcp_accept(struct svc_sock *svsk)
 {
 	struct sockaddr_storage addr;

@@ -1045,14 +1046,14 @@ svc_tcp_accept(struct svc_sock *svsk)
 	struct socket	*sock = svsk->sk_sock;
 	struct socket	*newsock;
 	struct svc_sock	*newsvsk;
-	int		err, slen;
+	int		err = 0, slen;
 	char		buf[RPC_MAX_ADDRBUFLEN];
 
 	dprintk("svc: tcp_accept %p sock %p\n", svsk, sock);
 	if (!sock)
-		return;
+		return -EINVAL;
 
-	clear_bit(SK_CONN, &svsk->sk_flags);
+	svc_sock_clear_connection_ready(svsk);
 	err = kernel_accept(sock, &newsock, O_NONBLOCK);
 	if (err < 0) {
 		if (err == -ENOMEM)

@@ -1061,10 +1062,10 @@ svc_tcp_accept(struct svc_sock *svsk)
 		else if (err != -EAGAIN && net_ratelimit())
 			printk(KERN_WARNING "%s: accept failed (err %d)!\n",
 				   serv->sv_name, -err);
-		return;
+		return err;
 	}
 
-	set_bit(SK_CONN, &svsk->sk_flags);
+	svc_sock_clear_connection_ready(svsk);
 	svc_sock_enqueue(svsk);
 
 	err = kernel_getpeername(newsock, sin, &slen);

@@ -1151,11 +1152,11 @@ svc_tcp_accept(struct svc_sock *svsk)
 	if (serv->sv_stats)
 		serv->sv_stats->nettcpconn++;
 
-	return;
+	return 0;
 
 failed:
 	sock_release(newsock);
-	return;
+	return err;
 }
 
 /*

@@ -1180,12 +1181,6 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
 		return svc_deferred_recv(rqstp);
 	}
 
-	if (svsk->sk_sk->sk_state == TCP_LISTEN) {
-		svc_tcp_accept(svsk);
-		svc_sock_received(svsk);
-		return 0;
-	}
-
 	if (test_and_clear_bit(SK_CHNGBUF, &svsk->sk_flags))
 		/* sndbuf needs to have room for one request
 		 * per thread, otherwise we can stall even when the

@@ -1389,7 +1384,8 @@ static const struct svc_sock_ops svc_tcp
 	.sko_free = svc_tcpip_free,
 	.sko_prepare_reply = svc_tcp_prepare_reply,
 	.sko_has_wspace = svc_tcp_has_wspace,
-	.sko_max_payload = svc_tcp_max_payload
+	.sko_max_payload = svc_tcp_max_payload,
+	.sko_accept = svc_tcp_accept
 };
 
 static void

@@ -1403,7 +1399,7 @@ svc_tcp_init(struct svc_sock *svsk)
 	if (sk->sk_state == TCP_LISTEN) {
 		dprintk("setting up TCP socket for listening\n");
 		sk->sk_data_ready = svc_tcp_listen_data_ready;
-		set_bit(SK_CONN, &svsk->sk_flags);
+		svc_sock_set_connection_ready(svsk);
 	} else {
 		dprintk("setting up TCP socket for reading\n");
 		sk->sk_state_change = svc_tcp_state_change;

@@ -1550,6 +1546,9 @@ svc_recv(struct svc_rqst *rqstp, long ti
 	if (test_bit(SK_CLOSE, &svsk->sk_flags)) {
 		dprintk("svc_recv: found SK_CLOSE\n");
 		svc_delete_socket(svsk);
+	} else if (svsk->sk_sk->sk_state == TCP_LISTEN) {
+		svsk->sk_ops->sko_accept(svsk);
+		svc_sock_received(svsk);
 	} else {
 		dprintk("svc: server %p, pool %u, socket %p, inuse=%d\n",
 			 rqstp, pool->sp_id, svsk, atomic_read(&svsk->sk_inuse));

@@ -1689,6 +1688,7 @@ static struct svc_sock *svc_setup_socket
 	int		is_temporary = flags & SVC_SOCK_TEMPORARY;
 
 	dprintk("svc: svc_setup_socket %p\n", sock);
+	*errp = 0;
 	if (!(svsk = kzalloc(sizeof(*svsk), GFP_KERNEL))) {
 		*errp = -ENOMEM;
 		return NULL;