From: greearb@candelatech.com
To: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ben Greear <greearb@candelatech.com>
Subject: [PATCH (RESEND) 09/12] nfs: Propagate src-addr in client code.
Date: Fri, 15 Jul 2011 10:56:05 -0700 [thread overview]
Message-ID: <1310752568-21280-10-git-send-email-greearb@candelatech.com> (raw)
In-Reply-To: <1310752568-21280-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>
---
:100644 100644 223785f... 8b8766a... M fs/nfs/client.c
fs/nfs/client.c | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 223785f..8b8766a 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -161,6 +161,8 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_
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;
@@ -655,6 +657,7 @@ static int nfs_create_rpc_client(struct nfs_client *clp,
.net = &init_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,
@@ -839,6 +842,8 @@ static int nfs_init_server(struct nfs_server *server,
.hostname = data->nfs_server.hostname,
.addr = (const struct sockaddr *)&data->nfs_server.address,
.addrlen = data->nfs_server.addrlen,
+ .srcaddr = (const struct sockaddr *)&data->srcaddr.address,
+ .srcaddrlen = data->srcaddr.addrlen,
.rpc_ops = &nfs_v2_clientops,
.proto = data->nfs_server.protocol,
};
@@ -1419,6 +1424,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)
@@ -1430,6 +1437,8 @@ static int nfs4_set_client(struct nfs_server *server,
.rpc_ops = &nfs_v4_clientops,
.proto = proto,
.minorversion = minorversion,
+ .srcaddr = srcaddr,
+ .srcaddrlen = srcaddrlen,
};
struct nfs_client *clp;
int error;
@@ -1604,6 +1613,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,
@@ -1701,6 +1712,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,
parent_server->client->cl_xprt->prot,
parent_server->client->cl_timeout,
--
1.7.3.4
next prev parent reply other threads:[~2011-07-15 17:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-15 17:55 [PATCH (RESEND) 00/12] Support binding nfs/rpc to local IP address greearb
2011-07-15 17:55 ` [PATCH (RESEND) 01/12] sunrpc: Don't attempt to bind to AF_UNSPEC address greearb
2011-07-15 17:55 ` [PATCH (RESEND) 02/12] nfs: Two AF_UNSPEC addresses should always match each other greearb
2011-07-15 17:55 ` [PATCH (RESEND) 03/12] nfs: Add srcaddr member to nfs_client greearb
2011-07-15 17:56 ` [PATCH (RESEND) 04/12] nfs: Use request destination addr as callback source addr greearb
2011-07-15 17:56 ` [PATCH (RESEND) 05/12] nfs: Pay attention to srcaddr in v4.1 callback logic greearb
2011-07-15 17:56 ` [PATCH (RESEND) 06/12] nfs: Use srcaddr in nfs_match_client greearb
2011-07-15 17:56 ` [PATCH (RESEND) 07/12] nfs: Add srcaddr to /proc/fs/nfsfs/servers greearb
2011-07-15 17:56 ` [PATCH (RESEND) 08/12] nfs: Pass srcaddr into mount request greearb
2011-07-15 17:56 ` greearb [this message]
2011-07-15 17:56 ` [PATCH (RESEND) 10/12] nfs: Bind to srcaddr in rpcb_create greearb
2011-07-15 17:56 ` [PATCH (RESEND) 11/12] nfs: Support srcaddr= to bind to specific IP address greearb
2011-07-15 17:56 ` [PATCH (RESEND) 12/12] lockd: Support binding nlm client to specific address greearb
2011-07-21 16:46 ` [PATCH (RESEND) 00/12] Support binding nfs/rpc to local IP address Ben Greear
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=1310752568-21280-10-git-send-email-greearb@candelatech.com \
--to=greearb@candelatech.com \
--cc=linux-kernel@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).