From: greearb@candelatech.com
To: linux-nfs@vger.kernel.org
Cc: Ben Greear <greearb@candelatech.com>
Subject: [RFC 04/13] nfs: Use request destination addr as callback source addr.
Date: Mon, 21 Jan 2013 12:45:50 -0800 [thread overview]
Message-ID: <1358801159-18829-5-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 helps make sure that responses use the correct
source address on multi-homed machines.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
fs/nfs/callback.h | 3 +++
fs/nfs/callback_xdr.c | 3 +++
include/linux/sunrpc/svc.h | 1 +
3 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index 4251c2a..1a695f7 100644
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@ -59,6 +59,7 @@ struct cb_compound_hdr_res {
struct cb_getattrargs {
struct sockaddr *addr;
+ struct sockaddr *srcaddr;
struct nfs_fh fh;
uint32_t bitmap[2];
};
@@ -74,6 +75,7 @@ struct cb_getattrres {
struct cb_recallargs {
struct sockaddr *addr;
+ struct sockaddr *srcaddr;
struct nfs_fh fh;
nfs4_stateid stateid;
uint32_t truncate;
@@ -94,6 +96,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 742ff4f..75cff02 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -198,6 +198,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));
@@ -210,6 +211,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;
@@ -448,6 +450,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 d83db80..bf134c3 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -313,6 +313,7 @@ static inline struct sockaddr *svc_daddr(const 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:[~2013-01-21 20:46 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 ` greearb [this message]
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 ` [RFC 08/13] nfs: Propagate src-addr in client code greearb
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-5-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.