[PATCH] knfsd: SUNRPC: Make rq_daddr field address-version independent
The rq_daddr field must support larger addresses.
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>
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 96c1b6a..6d6892f 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -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,7 +192,13 @@
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
* processed.
@@ -227,8 +234,8 @@
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_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];