From: greearb@candelatech.com
To: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Ben Greear <greearb@candelatech.com>
Subject: [PATCH (RESEND) 04/12] nfs: Use request destination addr as callback source addr.
Date: Fri, 15 Jul 2011 10:56:00 -0700 [thread overview]
Message-ID: <1310752568-21280-5-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 helps make sure that responses use the correct
source address on multi-homed machines.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
:100644 100644 b257383... 00902ec... M fs/nfs/callback.h
:100644 100644 c6c86a7... ed5be89... M fs/nfs/callback_xdr.c
:100644 100644 ea29330... 45d5d7c... M include/linux/sunrpc/svc.h
fs/nfs/callback.h | 3 +++
fs/nfs/callback_xdr.c | 3 +++
include/linux/sunrpc/svc.h | 5 +++++
3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index b257383..00902ec 100644
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@ -57,6 +57,7 @@ struct cb_compound_hdr_res {
struct cb_getattrargs {
struct sockaddr *addr;
+ struct sockaddr *srcaddr;
struct nfs_fh fh;
uint32_t bitmap[2];
};
@@ -72,6 +73,7 @@ struct cb_getattrres {
struct cb_recallargs {
struct sockaddr *addr;
+ struct sockaddr *srcaddr;
struct nfs_fh fh;
nfs4_stateid stateid;
uint32_t truncate;
@@ -92,6 +94,7 @@ struct referring_call_list {
struct cb_sequenceargs {
struct sockaddr *csa_addr;
+ struct sockaddr *csa_daddr;
struct nfs4_sessionid csa_sessionid;
uint32_t csa_sequenceid;
uint32_t csa_slotid;
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index c6c86a7..ed5be89 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -196,6 +196,7 @@ static __be32 decode_getattr_args(struct svc_rqst *rqstp, struct xdr_stream *xdr
if (unlikely(status != 0))
goto out;
args->addr = svc_addr(rqstp);
+ args->srcaddr = svc_daddr(rqstp);
status = decode_bitmap(xdr, args->bitmap);
out:
dprintk("%s: exit with status = %d\n", __func__, ntohl(status));
@@ -208,6 +209,7 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr,
__be32 status;
args->addr = svc_addr(rqstp);
+ args->srcaddr = svc_daddr(rqstp);
status = decode_stateid(xdr, &args->stateid);
if (unlikely(status != 0))
goto out;
@@ -442,6 +444,7 @@ static __be32 decode_cb_sequence_args(struct svc_rqst *rqstp,
goto out;
args->csa_addr = svc_addr(rqstp);
+ args->csa_daddr = svc_daddr(rqstp);
args->csa_sequenceid = ntohl(*p++);
args->csa_slotid = ntohl(*p++);
args->csa_highestslotid = ntohl(*p++);
diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index ea29330..45d5d7c 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -299,6 +299,11 @@ static inline struct sockaddr *svc_addr(const struct svc_rqst *rqst)
return (struct sockaddr *) &rqst->rq_addr;
}
+static inline struct sockaddr *svc_daddr(struct svc_rqst *rqst)
+{
+ return (struct sockaddr *) &rqst->rq_daddr;
+}
+
/*
* Check buffer bounds after decoding arguments
*/
--
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 ` greearb [this message]
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 ` [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-5-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).