From: greearb@candelatech.com
To: linux-nfs@vger.kernel.org
Cc: Ben Greear <greearb@candelatech.com>
Subject: [RFC 08/13] nfs: Propagate src-addr in client code.
Date: Mon, 21 Jan 2013 12:45:54 -0800 [thread overview]
Message-ID: <1358801159-18829-9-git-send-email-greearb@candelatech.com> (raw)
In-Reply-To: <1358801159-18829-1-git-send-email-greearb@candelatech.com>
From: Ben Greear <greearb@candelatech.com>
This ties the srcaddr supplied by mount to the
rpc code.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
fs/nfs/client.c | 5 +++++
fs/nfs/nfs4client.c | 8 ++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index e5230fe..bb0a8ce 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -167,6 +167,8 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)
memcpy(&clp->cl_addr, cl_init->addr, cl_init->addrlen);
clp->cl_addrlen = cl_init->addrlen;
+ memcpy(&clp->srcaddr, cl_init->srcaddr, cl_init->srcaddrlen);
+ clp->srcaddrlen = cl_init->srcaddrlen;
if (cl_init->hostname) {
err = -ENOMEM;
@@ -594,6 +596,7 @@ int nfs_create_rpc_client(struct nfs_client *clp,
.net = clp->cl_net,
.protocol = clp->cl_proto,
.address = (struct sockaddr *)&clp->cl_addr,
+ .saddress = (struct sockaddr *)&clp->srcaddr,
.addrsize = clp->cl_addrlen,
.timeout = timeparms,
.servername = clp->cl_hostname,
@@ -751,6 +754,8 @@ static int nfs_init_server(struct nfs_server *server,
.addr = (const struct sockaddr *)&data->nfs_server.address,
.addrlen = data->nfs_server.addrlen,
.nfs_mod = nfs_mod,
+ .srcaddr = (const struct sockaddr *)&data->srcaddr.address,
+ .srcaddrlen = data->srcaddr.addrlen,
.proto = data->nfs_server.protocol,
.net = data->net,
};
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 7c4dc21..bdd5f3b 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -610,6 +610,8 @@ static int nfs4_set_client(struct nfs_server *server,
const struct sockaddr *addr,
const size_t addrlen,
const char *ip_addr,
+ const struct sockaddr *srcaddr,
+ const size_t srcaddrlen,
rpc_authflavor_t authflavour,
int proto, const struct rpc_timeout *timeparms,
u32 minorversion, struct net *net)
@@ -622,6 +624,8 @@ static int nfs4_set_client(struct nfs_server *server,
.proto = proto,
.minorversion = minorversion,
.net = net,
+ .srcaddr = srcaddr,
+ .srcaddrlen = srcaddrlen,
};
struct nfs_client *clp;
int error;
@@ -796,6 +800,8 @@ static int nfs4_init_server(struct nfs_server *server,
(const struct sockaddr *)&data->nfs_server.address,
data->nfs_server.addrlen,
data->client_address,
+ (const struct sockaddr *)&data->srcaddr.address,
+ data->srcaddr.addrlen,
data->auth_flavors[0],
data->nfs_server.protocol,
&timeparms,
@@ -896,6 +902,8 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data,
data->addr,
data->addrlen,
parent_client->cl_ipaddr,
+ (const struct sockaddr *)&parent_client->srcaddr,
+ parent_client->srcaddrlen,
data->authflavor,
rpc_protocol(parent_server->client),
parent_server->client->cl_timeout,
--
1.7.3.4
next prev parent reply other threads:[~2013-01-21 20:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-21 20:45 [RFC 00/13] Allow NFS to bind to local IP address greearb
2013-01-21 20:45 ` [RFC 01/13] sunrpc: Don't attempt to bind to AF_UNSPEC address greearb
2013-01-21 20:45 ` [RFC 02/13] nfs: Two AF_UNSPEC addresses should always match each other greearb
2013-01-21 20:45 ` [RFC 03/13] nfs: Add srcaddr member to nfs_client greearb
2013-01-21 20:45 ` [RFC 04/13] nfs: Use request destination addr as callback source addr greearb
2013-01-21 20:45 ` [RFC 05/13] nfs: Pay attention to srcaddr in v4.1 callback logic greearb
2013-01-21 20:45 ` [RFC 06/13] nfs: Use srcaddr in nfs_match_client greearb
2013-01-21 20:45 ` [RFC 07/13] nfs: Pass srcaddr into mount request greearb
2013-01-21 20:45 ` greearb [this message]
2013-01-21 20:45 ` [RFC 09/13] nfs: Bind to srcaddr in rpcb_create greearb
2013-01-21 20:45 ` [RFC 10/13] nfs: Support srcaddr= to bind to specific IP address greearb
2013-01-21 20:45 ` [RFC 11/13] nfs: Add srcaddr to /proc/fs/nfsfs/servers greearb
2013-01-21 20:45 ` [RFC 12/13] lockd: Support binding nlm client to specific address greearb
2013-01-21 20:45 ` [RFC 13/13] nfs: Allow up to 5000 NFSv4 connections (instead of 1024) greearb
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358801159-18829-9-git-send-email-greearb@candelatech.com \
--to=greearb@candelatech.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.