From: greearb@candelatech.com
To: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ben Greear <greearb@candelatech.com>
Subject: [PATCH (RESEND) 07/12] nfs: Add srcaddr to /proc/fs/nfsfs/servers
Date: Fri, 15 Jul 2011 10:56:03 -0700 [thread overview]
Message-ID: <1310752568-21280-8-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>
Helps users understand whether a server instance is
bound to a local IP or not.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
:100644 100644 5d8998a... 223785f... M fs/nfs/client.c
fs/nfs/client.c | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 5d8998a..223785f 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1895,20 +1895,34 @@ static int nfs_server_list_show(struct seq_file *m, void *v)
/* display header on line 1 */
if (v == &nfs_client_list) {
- seq_puts(m, "NV SERVER PORT USE HOSTNAME\n");
+ seq_puts(m, "NV SERVER PORT USE HOSTNAME"
+ " SRCADDR\n");
return 0;
}
/* display one transport per line on subsequent lines */
clp = list_entry(v, struct nfs_client, cl_share_link);
- seq_printf(m, "v%u %s %s %3d %s\n",
+ seq_printf(m, "v%u %s %s %3d %s",
clp->rpc_ops->version,
rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_HEX_ADDR),
rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_HEX_PORT),
atomic_read(&clp->cl_count),
clp->cl_hostname);
+ if (clp->srcaddr.ss_family == AF_INET) {
+ const struct sockaddr_in *sin;
+ sin = (const struct sockaddr_in *)&clp->srcaddr;
+ seq_printf(m, " %pI4\n", &sin->sin_addr.s_addr);
+ } else if (clp->srcaddr.ss_family == AF_INET6) {
+ const struct sockaddr_in6 *sin6;
+ sin6 = (const struct sockaddr_in6 *)&clp->srcaddr;
+ seq_printf(m, " %pI6c\n", &sin6->sin6_addr);
+ } else if (clp->srcaddr.ss_family == AF_UNSPEC)
+ seq_printf(m, " ANY\n");
+ else
+ seq_printf(m, " UNKNOWN_%i\n", (int)(clp->srcaddr.ss_family));
+
return 0;
}
--
1.7.3.4
next prev parent reply other threads:[~2011-07-15 17:57 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 ` greearb [this message]
2011-07-15 17:56 ` [PATCH (RESEND) 08/12] nfs: Pass srcaddr into mount request greearb
2011-07-15 17:56 ` [PATCH (RESEND) 09/12] nfs: Propagate src-addr in client code greearb
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-8-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).