From patchwork Fri Jul 15 17:56:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 980132 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6FHwUb0031713 for ; Fri, 15 Jul 2011 17:58:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755837Ab1GOR5X (ORCPT ); Fri, 15 Jul 2011 13:57:23 -0400 Received: from mail.candelatech.com ([208.74.158.172]:58947 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755744Ab1GOR5U (ORCPT ); Fri, 15 Jul 2011 13:57:20 -0400 Received: from fs3.candelatech.com (firewall.candelatech.com [70.89.124.249]) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id p6FHuIUc019371 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 15 Jul 2011 10:56:19 -0700 From: greearb@candelatech.com To: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ben Greear Subject: [PATCH (RESEND) 04/12] nfs: Use request destination addr as callback source addr. Date: Fri, 15 Jul 2011 10:56:00 -0700 Message-Id: <1310752568-21280-5-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1310752568-21280-1-git-send-email-greearb@candelatech.com> References: <1310752568-21280-1-git-send-email-greearb@candelatech.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 15 Jul 2011 17:58:42 +0000 (UTC) From: Ben Greear This helps make sure that responses use the correct source address on multi-homed machines. Signed-off-by: Ben Greear --- :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 */