2 files changed, 11 insertions, 6 deletions

diff --git a/include/linux/sunrpc/svcsock.h b/include/linux/sunrpc/svcsock.h
index f030409d2994..cccea0a0feb4 100644
--- a/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@ -57,6 +57,9 @@ struct svc_sock {
 
         /* cache of various info for TCP sockets */
         void                    *sk_info_authunix;
+
+        struct sockaddr_storage sk_remote;      /* remote peer's address */
+        int                     sk_remotelen;   /* length of address */
 };
 
 /*
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 7292baf5a741..1f97ed49fee2 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -568,12 +568,13 @@ svc_recv_available(struct svc_sock *svsk)
 static int
 svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, int buflen)
 {
+        struct svc_sock *svsk = rqstp->rq_sock;
         struct msghdr   msg;
         struct socket   *sock;
-        int             len, alen;
+        int             len;
 
         rqstp->rq_addrlen = sizeof(rqstp->rq_addr);
-        sock = rqstp->rq_sock->sk_sock;
+        sock = svsk->sk_sock;
 
         msg.msg_name    = &rqstp->rq_addr;
         msg.msg_namelen = sizeof(rqstp->rq_addr);
@@ -585,11 +586,9 @@ svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, int buflen)
         len = kernel_recvmsg(sock, &msg, iov, nr, buflen, MSG_DONTWAIT);
 
         /* 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);
@@ -938,6 +937,9 @@ 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.