Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

include/linux/sunrpc/svc.h

+3 −2
Original line number Diff line number Diff line
@@ -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;

net/sunrpc/svcsock.c

+4 −2
Original line number Diff line number Diff line
@@ -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;