From: greearb@candelatech.com
To: linux-nfs@vger.kernel.org
Cc: Ben Greear <greearb@candelatech.com>
Subject: [PATCH v2 06/12] nfs: Use srcaddr in nfs_match_client.
Date: Thu, 23 Jun 2011 12:29:40 -0700 [thread overview]
Message-ID: <1308857388-12243-7-git-send-email-greearb@candelatech.com> (raw)
In-Reply-To: <1308857388-12243-1-git-send-email-greearb@candelatech.com>
From: Ben Greear <greearb@candelatech.com>
For bound clients, we have to make sure we do not re-use
a client that is bound differently.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
:100644 100644 c571a97... 5d8998a... M fs/nfs/client.c
fs/nfs/client.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index c571a97..5d8998a 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -131,7 +131,9 @@ struct rpc_program nfsacl_program = {
struct nfs_client_initdata {
const char *hostname;
const struct sockaddr *addr;
+ const struct sockaddr *srcaddr;
size_t addrlen;
+ size_t srcaddrlen;
const struct nfs_rpc_ops *rpc_ops;
int proto;
u32 minorversion;
@@ -463,6 +465,9 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat
list_for_each_entry(clp, &nfs_client_list, cl_share_link) {
const struct sockaddr *clap = (struct sockaddr *)&clp->cl_addr;
+ const struct sockaddr *sa;
+ sa = (const struct sockaddr *)&clp->srcaddr;
+
/* Don't match clients that failed to initialise properly */
if (clp->cl_cons_state < 0)
continue;
@@ -480,6 +485,13 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat
if (!nfs_sockaddr_cmp(sap, clap))
continue;
+ /* Check to make sure local-IP bindings match,
+ * but just the IP-addr.
+ */
+ if (data->srcaddr &&
+ !nfs_sockaddr_match_ipaddr(data->srcaddr, sa))
+ continue;
+
atomic_inc(&clp->cl_count);
return clp;
}
--
1.7.3.4
next prev parent reply other threads:[~2011-06-23 19:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-23 19:29 [PATCH v2 00/12] NFS: Support binding to source address greearb
2011-06-23 19:29 ` [PATCH v2 01/12] sunrpc: Don't attempt to bind to AF_UNSPEC address greearb
2011-06-23 19:29 ` [PATCH v2 02/12] nfs: Two AF_UNSPEC addresses should always match each other greearb
2011-06-23 19:29 ` [PATCH v2 03/12] nfs: Add srcaddr member to nfs_client greearb
2011-06-23 19:29 ` [PATCH v2 04/12] nfs: Use request destination addr as callback source addr greearb
2011-06-23 19:29 ` [PATCH v2 05/12] nfs: Pay attention to srcaddr in v4.1 callback logic greearb
2011-06-23 19:29 ` greearb [this message]
2011-06-23 19:29 ` [PATCH v2 07/12] nfs: Add srcaddr to /proc/fs/nfsfs/servers greearb
2011-06-23 19:29 ` [PATCH v2 08/12] nfs: Pass srcaddr into mount request greearb
2011-06-23 19:29 ` [PATCH v2 09/12] nfs: Propagate src-addr in client code greearb
2011-06-23 19:29 ` [PATCH v2 10/12] nfs: Bind to srcaddr in rpcb_create greearb
2011-06-23 19:29 ` [PATCH v2 11/12] lockd: Support binding nlm client to specific address greearb
2011-06-23 19:29 ` [PATCH v2 11/12] nfs: Support srcaddr= to bind to specific IP address greearb
2011-06-23 19:29 ` [PATCH v2 12/12] lockd: Support binding nlm client to specific address greearb
2011-06-23 19:29 ` [PATCH v2 12/12] nfs: Support srcaddr= to bind to specific IP address greearb
2011-07-07 21:26 ` [PATCH v2 00/12] NFS: Support binding to source 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=1308857388-12243-7-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.