[PATCH] knfsd: SUNRPC: Don't set msg_name and msg_namelen when calling sock_recvmsg

[powerpc.git] / net / sunrpc / svcsock.c

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index d120fad..a98be09 100644 (file)
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -568,31 +568,22 @@ svc_recv_available(struct svc_sock *svsk)
 static int
 svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, int buflen)
 {
-       struct msghdr   msg;
-       struct socket   *sock;
-       int             len, alen;
-
-       rqstp->rq_addrlen = sizeof(rqstp->rq_addr);
-       sock = rqstp->rq_sock->sk_sock;
-
-       msg.msg_name    = &rqstp->rq_addr;
-       msg.msg_namelen = sizeof(rqstp->rq_addr);
-       msg.msg_control = NULL;
-       msg.msg_controllen = 0;
-
-       msg.msg_flags   = MSG_DONTWAIT;
+       struct svc_sock *svsk = rqstp->rq_sock;
+       struct msghdr msg = {
+               .msg_flags      = MSG_DONTWAIT,
+       };
+       int len;
 
-       len = kernel_recvmsg(sock, &msg, iov, nr, buflen, MSG_DONTWAIT);
+       len = kernel_recvmsg(svsk->sk_sock, &msg, iov, nr, buflen,
+                               msg.msg_flags);
 
        /* sock_recvmsg doesn't fill in the name/namelen, so we must..
-        * possibly we should cache this in the svc_sock structure
-        * at accept time. FIXME
         */
-       alen = sizeof(rqstp->rq_addr);
-       kernel_getpeername(sock, (struct sockaddr *)&rqstp->rq_addr, &alen);
+       memcpy(&rqstp->rq_addr, &svsk->sk_remote, svsk->sk_remotelen);
+       rqstp->rq_addrlen = svsk->sk_remotelen;
 
        dprintk("svc: socket %p recvfrom(%p, %Zu) = %d\n",
-               rqstp->rq_sock, iov[0].iov_base, iov[0].iov_len, len);
+               svsk, iov[0].iov_base, iov[0].iov_len, len);
 
        return len;
 }
@@ -938,7 +929,10 @@ svc_tcp_accept(struct svc_sock *svsk)
        if (!(newsvsk = svc_setup_socket(serv, newsock, &err,
                                 (SVC_SOCK_ANONYMOUS | SVC_SOCK_TEMPORARY))))
                goto failed;
+       memcpy(&newsvsk->sk_remote, &sin, slen);
+       newsvsk->sk_remotelen = slen;
 
+       svc_sock_received(newsvsk);
 
        /* make sure that we don't have too many active connections.
         * If we have, something must be dropped.
@@ -1546,8 +1540,6 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv,
        dprintk("svc: svc_setup_socket created %p (inet %p)\n",
                                svsk, svsk->sk_sk);
 
-       clear_bit(SK_BUSY, &svsk->sk_flags);
-       svc_sock_enqueue(svsk);
        return svsk;
 }
 
@@ -1571,8 +1563,10 @@ int svc_addsock(struct svc_serv *serv,
                err = -EISCONN;
        else {
                svsk = svc_setup_socket(serv, so, &err, SVC_SOCK_DEFAULTS);
-               if (svsk)
+               if (svsk) {
+                       svc_sock_received(svsk);
                        err = 0;
+               }
        }
        if (err) {
                sockfd_put(so);
@@ -1623,8 +1617,10 @@ static int svc_create_socket(struct svc_serv *serv, int protocol,
                        goto bummer;
        }
 
-       if ((svsk = svc_setup_socket(serv, sock, &error, flags)) != NULL)
+       if ((svsk = svc_setup_socket(serv, sock, &error, flags)) != NULL) {
+               svc_sock_received(svsk);
                return ntohs(inet_sk(svsk->sk_sk)->sport);
+       }
 
 bummer:
        dprintk("svc: svc_create_socket error = %d\n", -error);