Commit 24422222 authored by Chuck Lever's avatar Chuck Lever Committed by Linus Torvalds

[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: default avatarChuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ad06e4bd
...@@ -292,8 +292,9 @@ static inline void svc_free_res_pages(struct svc_rqst *rqstp) ...@@ -292,8 +292,9 @@ static inline void svc_free_res_pages(struct svc_rqst *rqstp)
struct svc_deferred_req { struct svc_deferred_req {
u32 prot; /* protocol (UDP or TCP) */ u32 prot; /* protocol (UDP or TCP) */
struct sockaddr_in addr; struct svc_sock *svsk;
struct svc_sock *svsk; /* where reply must go */ struct sockaddr_storage addr; /* where reply must go */
size_t addrlen;
__be32 daddr; /* where reply must come from */ __be32 daddr; /* where reply must come from */
struct cache_deferred_req handle; struct cache_deferred_req handle;
int argslen; int argslen;
......
...@@ -1785,7 +1785,8 @@ svc_defer(struct cache_req *req) ...@@ -1785,7 +1785,8 @@ svc_defer(struct cache_req *req)
dr->handle.owner = rqstp->rq_server; dr->handle.owner = rqstp->rq_server;
dr->prot = rqstp->rq_prot; 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->daddr = rqstp->rq_daddr;
dr->argslen = rqstp->rq_arg.len >> 2; dr->argslen = rqstp->rq_arg.len >> 2;
memcpy(dr->args, rqstp->rq_arg.head[0].iov_base-skip, dr->argslen<<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) ...@@ -1809,7 +1810,8 @@ static int svc_deferred_recv(struct svc_rqst *rqstp)
rqstp->rq_arg.page_len = 0; rqstp->rq_arg.page_len = 0;
rqstp->rq_arg.len = dr->argslen<<2; rqstp->rq_arg.len = dr->argslen<<2;
rqstp->rq_prot = dr->prot; 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_daddr = dr->daddr;
rqstp->rq_respages = rqstp->rq_pages; rqstp->rq_respages = rqstp->rq_pages;
return dr->argslen<<2; return dr->argslen<<2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment