[PATCH] knfsd: SUNRPC: Use sockaddr_storage to store address in svc_deferred_req

Sockaddr_storage will allow us to store arbitrary socket addresses in the
svc_deferred_req struct.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 7 insertions, 4 deletions

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 1178689b9156..52db9c8985c5 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -292,8 +292,9 @@ static inline void svc_free_res_pages(struct svc_rqst *rqstp)
 
 struct svc_deferred_req {
         u32                     prot;   /* protocol (UDP or TCP) */
-        struct sockaddr_in      addr;
-        struct svc_sock         *svsk;  /* where reply must go */
+        struct svc_sock         *svsk;
+        struct sockaddr_storage addr;   /* where reply must go */
+        size_t                  addrlen;
         __be32                  daddr;  /* where reply must come from */
         struct cache_deferred_req handle;
         int                     argslen;
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 08de328ce433..6680e0f0560d 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1785,7 +1785,8 @@ svc_defer(struct cache_req *req)
 
                 dr->handle.owner = rqstp->rq_server;
                 dr->prot = rqstp->rq_prot;
-                dr->addr = rqstp->rq_addr;
+                memcpy(&dr->addr, &rqstp->rq_addr, rqstp->rq_addrlen);
+                dr->addrlen = rqstp->rq_addrlen;
                 dr->daddr = rqstp->rq_daddr;
                 dr->argslen = rqstp->rq_arg.len >> 2;
                 memcpy(dr->args, rqstp->rq_arg.head[0].iov_base-skip, dr->argslen<<2);
@@ -1809,7 +1810,8 @@ static int svc_deferred_recv(struct svc_rqst *rqstp)
         rqstp->rq_arg.page_len = 0;
         rqstp->rq_arg.len = dr->argslen<<2;
         rqstp->rq_prot        = dr->prot;
-        rqstp->rq_addr        = dr->addr;
+        memcpy(&rqstp->rq_addr, &dr->addr, dr->addrlen);
+        rqstp->rq_addrlen     = dr->addrlen;
         rqstp->rq_daddr       = dr->daddr;
         rqstp->rq_respages    = rqstp->rq_pages;
         return dr->argslen<<2;