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

[PATCH] knfsd: SUNRPC: Make rq_daddr field address-version independent 



The rq_daddr field must support larger addresses.

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 27459f09

include/linux/sunrpc/svc.h

+11 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define SUNRPC_SVC_H



#include <linux/in.h>

#include <linux/in6.h>

#include <linux/sunrpc/types.h>

#include <linux/sunrpc/xdr.h>

#include <linux/sunrpc/auth.h>
@@ -191,6 +192,12 @@ static inline void svc_putu32(struct kvec *iov, __be32 val) 
	iov->iov_len += sizeof(__be32);

}



union svc_addr_u {

    struct in_addr	addr;

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

    struct in6_addr	addr6;

#endif

};



/*

 * The context of a single thread, including the request currently being
@@ -227,8 +234,8 @@ struct svc_rqst { 
	unsigned short

				rq_secure  : 1;	/* secure port */





	__be32			rq_daddr;	/* dest addr of request - reply from here */

	union svc_addr_u	rq_daddr;	/* dest addr of request

						 *  - reply from here */



	void *			rq_argp;	/* decoded arguments */

	void *			rq_resp;	/* xdr'd results */
@@ -308,7 +315,7 @@ struct svc_deferred_req { 
	struct svc_sock		*svsk;

	struct sockaddr_storage	addr;	/* where reply must go */

	size_t			addrlen;

	__be32			daddr;	/* where reply must come from */

	union svc_addr_u	daddr;	/* where reply must come from */

	struct cache_deferred_req handle;

	int			argslen;

	__be32			args[0];

net/sunrpc/svcsock.c

+2 −2
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr) 
		cmh->cmsg_level = SOL_IP;

		cmh->cmsg_type = IP_PKTINFO;

		pki->ipi_ifindex = 0;

		pki->ipi_spec_dst.s_addr = rqstp->rq_daddr;

		pki->ipi_spec_dst.s_addr = rqstp->rq_daddr.addr.s_addr;



		if (sock_sendmsg(sock, &msg, 0) < 0)

			goto out;
@@ -763,7 +763,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp) 
	rqstp->rq_addrlen = sizeof(struct sockaddr_in);



	/* Remember which interface received this request */

	rqstp->rq_daddr = skb->nh.iph->daddr;

	rqstp->rq_daddr.addr.s_addr = skb->nh.iph->daddr;



	if (skb_is_nonlinear(skb)) {

		/* we have to copy */