Home » Mailing list archives » linux-nfs » 2007 » December » 10

[PATCH 18/27] NFS: Change cb_recallargs to pass "struct sockaddr *" instead of sockaddr_in

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Chuck Lever
Subject: [PATCH 18/27] NFS: Change cb_recallargs to pass "struct sockaddr *" instead of sockaddr_in
Date: Monday, December 10, 2007 - 12:58 pm

Change the addr field in the cb_recallargs struct to a "struct sockaddr *"
to support non-IPv4 addresses.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
---

 fs/nfs/callback.h      |    2 +-
 fs/nfs/callback_proc.c |    2 +-
 fs/nfs/callback_xdr.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index ec0ffd9..bb25d21 100644
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@ -53,7 +53,7 @@ struct cb_getattrres {
 };
 
 struct cb_recallargs {
-	struct sockaddr_in *addr;
+	struct sockaddr *addr;
 	struct nfs_fh fh;
 	nfs4_stateid stateid;
 	uint32_t truncate;
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index 32f0df0..fa9586d 100644
--- a/fs/nfs/callback_proc.c
+++ b/fs/nfs/callback_proc.c
@@ -68,7 +68,7 @@ __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy)
 	__be32 res;
 	
 	res = htonl(NFS4ERR_BADHANDLE);
-	clp = nfs_find_client(args->addr, 4);
+	clp = nfs_find_client((struct sockaddr_in *)args->addr, 4);
 	if (clp == NULL)
 		goto out;
 
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index 3eda1bc..c63eb72 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -188,7 +188,7 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr,
 	__be32 *p;
 	__be32 status;
 
-	args->addr = svc_addr_in(rqstp);
+	args->addr = svc_addr(rqstp);
 	status = decode_stateid(xdr, &args->stateid);
 	if (unlikely(status != 0))
 		goto out;

-
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/27] IPv6 infrastructure for NFS client, Chuck Lever, (Mon Dec 10, 12:56 pm)
[PATCH 01/27] SUNRPC: rpc_create() default hostname should ..., Chuck Lever, (Mon Dec 10, 12:56 pm)
[PATCH 02/27] SUNRPC: Fix socket address handling in rpcb_clnt, Chuck Lever, (Mon Dec 10, 12:56 pm)
[PATCH 03/27] SUNRPC: RPC version numbers are u32, Chuck Lever, (Mon Dec 10, 12:56 pm)
[PATCH 04/27] SUNRPC: Move universal address definitions t ..., Chuck Lever, (Mon Dec 10, 12:56 pm)
[PATCH 05/27] NFS: Ensure NFSv4 SETCLIENTID send buffer is ..., Chuck Lever, (Mon Dec 10, 12:56 pm)
[PATCH 06/27] NFS: Increase size of cl_ipaddr field to hol ..., Chuck Lever, (Mon Dec 10, 12:57 pm)
[PATCH 07/27] NFS: Enable NFS client to generate CLIENTID ..., Chuck Lever, (Mon Dec 10, 12:57 pm)
[PATCH 08/27] NFS: eliminate NIPQUAD(clp-&gt;cl_addr.sin_addr), Chuck Lever, (Mon Dec 10, 12:57 pm)
[PATCH 09/27] NFS: Move dprintks from callback.c to callba ..., Chuck Lever, (Mon Dec 10, 12:57 pm)
[PATCH 10/27] NFS: Address a couple of nits in nfs_follow_ ..., Chuck Lever, (Mon Dec 10, 12:57 pm)
[PATCH 11/27] NFS: Add support for AF_INET6 addresses in n ..., Chuck Lever, (Mon Dec 10, 12:57 pm)
[PATCH 12/27] NFS: Verify IPv6 addresses properly, Chuck Lever, (Mon Dec 10, 12:57 pm)
[PATCH 13/27] NFS: Make setting a port number agostic, Chuck Lever, (Mon Dec 10, 12:57 pm)
[PATCH 14/27] NFS: Set default port for NFSv4, with suppor ..., Chuck Lever, (Mon Dec 10, 12:58 pm)
[PATCH 15/27] NFS: Add support for AF_INET6 addresses in _ ..., Chuck Lever, (Mon Dec 10, 12:58 pm)
[PATCH 16/27] NFS: Expand server address storage in nfs_cl ..., Chuck Lever, (Mon Dec 10, 12:58 pm)
[PATCH 17/27] NFS: Change cb_getattrargs to pass &quot;struct s ..., Chuck Lever, (Mon Dec 10, 12:58 pm)
[PATCH 18/27] NFS: Change cb_recallargs to pass "struct so ..., Chuck Lever, (Mon Dec 10, 12:58 pm)
[PATCH 19/27] NFS: Make nfs_alloc_client() take (sockaddr, ..., Chuck Lever, (Mon Dec 10, 12:58 pm)
[PATCH 20/27] NFS: Change nfs_find_client() to take &quot;struc ..., Chuck Lever, (Mon Dec 10, 12:58 pm)
[PATCH 21/27] NFS: Change nfs_get_client() to take sockaddr *, Chuck Lever, (Mon Dec 10, 12:58 pm)
[PATCH 22/27] NFS: Change nfs4_set_client() to accept stru ..., Chuck Lever, (Mon Dec 10, 12:58 pm)
[PATCH 23/27] NFS: Adjust nfs_clone_mount structure to sto ..., Chuck Lever, (Mon Dec 10, 12:59 pm)
[PATCH 24/27] NFS: Remove the NIPQUAD from nfs_try_mount, Chuck Lever, (Mon Dec 10, 12:59 pm)
[PATCH 25/27] NFS: Refactor mount option address parsing i ..., Chuck Lever, (Mon Dec 10, 12:59 pm)
[PATCH 26/27] NFS: Support non-IPv4 addresses in nfs_parse ..., Chuck Lever, (Mon Dec 10, 12:59 pm)
[PATCH 27/27] NFS: Pull covers off IPv6 address parsing, Chuck Lever, (Mon Dec 10, 12:59 pm)
Re: [PATCH 01/27] SUNRPC: rpc_create() default hostname sh ..., Peter Staubach, (Mon Dec 10, 1:23 pm)
Re: [PATCH 01/27] SUNRPC: rpc_create() default hostname sh ..., Chuck Lever, (Mon Dec 10, 1:37 pm)
Re: [PATCH 01/27] SUNRPC: rpc_create() default hostname sh ..., Peter Staubach, (Mon Dec 10, 1:55 pm)