summaryrefslogtreecommitdiff
path: root/include/linux/sunrpc/svc.h
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-02-12 11:53:35 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 20:48:36 +0300
commit73df0dbaff8d0853387e140f52b6250c486b18a1 (patch)
treef1b3a669b47744b982ba5e25af329712abd36bf5 /include/linux/sunrpc/svc.h
parent27459f0940e16c68e080f5fc7e85aa9eb3f74528 (diff)
downloadlinux-73df0dbaff8d0853387e140f52b6250c486b18a1.tar.xz
[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>
Diffstat (limited to 'include/linux/sunrpc/svc.h')
-rw-r--r--include/linux/sunrpc/svc.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 96c1b6ae7d96..6d6892fa1d40 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 @@ 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
* processed.
@@ -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];