Attachment 159189 Details for Bug 248149 – patch -- bind nfsv4 sockets to clientaddr

[patch] patch -- bind nfsv4 sockets to clientaddr

linux-2.6-nfs4-clientaddr-bind.patch (text/plain), 1.39 KB, created by Jeff Layton on 2007-07-13 14:12:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-07-13 14:12:53 UTC

Size: 1.39 KB

patch

obsolete

>diff --git a/fs/nfs/client.c b/fs/nfs/client.c
>index 881fa49..5dd7990 100644
>--- a/fs/nfs/client.c
>+++ b/fs/nfs/client.c
>@@ -398,6 +398,7 @@ static int nfs_create_rpc_client(struct nfs_client *clp, int proto,
> {
> 	struct rpc_timeout	timeparms;
> 	struct rpc_clnt		*clnt = NULL;
>+	struct sockaddr_in	sin_client;
> 	struct rpc_create_args args = {
> 		.protocol	= proto,
> 		.address	= (struct sockaddr *)&clp->cl_addr,
>@@ -413,6 +414,11 @@ static int nfs_create_rpc_client(struct nfs_client *clp, int proto,
> 	if (!IS_ERR(clp->cl_rpcclient))
> 		return 0;
> 
>+	/* if cl_ipaddr is set then set the src address to be the same */
>+	if (clp->cl_ipaddr[0] != '\0' && in4_pton(clp->cl_ipaddr, -1,
>+		(u8 *) &sin_client.sin_addr.s_addr, 0, NULL))
>+			args.saddress = (struct sockaddr *) &sin_client;
>+
> 	nfs_init_timeout_values(&timeparms, proto, timeo, retrans);
> 	clp->retrans_timeo = timeparms.to_initval;
> 	clp->retrans_count = timeparms.to_retries;
>@@ -870,11 +876,12 @@ static int nfs4_init_client(struct nfs_client *clp,
> 	/* Check NFS protocol revision and initialize RPC op vector */
> 	clp->rpc_ops = &nfs_v4_clientops;
> 
>+	memcpy(clp->cl_ipaddr, ip_addr, sizeof(clp->cl_ipaddr));
>+
> 	error = nfs_create_rpc_client(clp, proto, timeo, retrans, authflavour,
> 					RPC_CLNT_CREATE_DISCRTRY);
> 	if (error < 0)
> 		goto error;
>-	memcpy(clp->cl_ipaddr, ip_addr, sizeof(clp->cl_ipaddr));
> 
> 	error = nfs_idmap_new(clp);
> 	if (error < 0) {

Actions: View | Diff

Attachments on bug 248149: 159189 | 159363 | 159516