[PATCH] svcrpc: save and restore the daddr field when request deferred (1918e341) · Commits · 戴 / test

The server code currently keeps track of the destination address on every request so that it can reply using the same address. However we forget to do that in the case of a deferred request. Remedy this oversight. >From folks at PolyServe. Signed-off-by:

J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by:

Neil Brown <neilb@suse.de> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

include/linux/sunrpc/svc.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,7 @@ struct svc_deferred_req {
		u32 prot; /* protocol (UDP or TCP) */
		struct sockaddr_in addr;
		struct svc_sock svsk; / where reply must go */
		u32 daddr; /* where reply must come from */
		struct cache_deferred_req handle;
		int argslen;
		u32 args[0];

net/sunrpc/svcsock.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1527,6 +1527,7 @@ svc_defer(struct cache_req *req)
		dr->handle.owner = rqstp->rq_server;
		dr->prot = rqstp->rq_prot;
		dr->addr = rqstp->rq_addr;
		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);
		}
		@@ -1552,6 +1553,7 @@ static int svc_deferred_recv(struct svc_rqst *rqstp)
		rqstp->rq_arg.len = dr->argslen<<2;
		rqstp->rq_prot = dr->prot;
		rqstp->rq_addr = dr->addr;
		rqstp->rq_daddr = dr->daddr;
		return dr->argslen<<2;
		}

Admin message