From patchwork Fri Jul 15 17:56:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 980102 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 p6FHwUav031713 for ; Fri, 15 Jul 2011 17:58:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755803Ab1GOR6K (ORCPT ); Fri, 15 Jul 2011 13:58:10 -0400 Received: from mail.candelatech.com ([208.74.158.172]:58969 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755825Ab1GOR6J (ORCPT ); Fri, 15 Jul 2011 13:58:09 -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 p6FHuIUh019371 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 15 Jul 2011 10:56:20 -0700 From: greearb@candelatech.com To: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ben Greear Subject: [PATCH (RESEND) 09/12] nfs: Propagate src-addr in client code. Date: Fri, 15 Jul 2011 10:56:05 -0700 Message-Id: <1310752568-21280-10-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:30 +0000 (UTC) From: Ben Greear This ties the srcaddr supplied by mount to the rpc code. Signed-off-by: Ben Greear --- :100644 100644 223785f... 8b8766a... M fs/nfs/client.c fs/nfs/client.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 223785f..8b8766a 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -161,6 +161,8 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_ memcpy(&clp->cl_addr, cl_init->addr, cl_init->addrlen); clp->cl_addrlen = cl_init->addrlen; + memcpy(&clp->srcaddr, cl_init->srcaddr, cl_init->srcaddrlen); + clp->srcaddrlen = cl_init->srcaddrlen; if (cl_init->hostname) { err = -ENOMEM; @@ -655,6 +657,7 @@ static int nfs_create_rpc_client(struct nfs_client *clp, .net = &init_net, .protocol = clp->cl_proto, .address = (struct sockaddr *)&clp->cl_addr, + .saddress = (struct sockaddr *)&clp->srcaddr, .addrsize = clp->cl_addrlen, .timeout = timeparms, .servername = clp->cl_hostname, @@ -839,6 +842,8 @@ static int nfs_init_server(struct nfs_server *server, .hostname = data->nfs_server.hostname, .addr = (const struct sockaddr *)&data->nfs_server.address, .addrlen = data->nfs_server.addrlen, + .srcaddr = (const struct sockaddr *)&data->srcaddr.address, + .srcaddrlen = data->srcaddr.addrlen, .rpc_ops = &nfs_v2_clientops, .proto = data->nfs_server.protocol, }; @@ -1419,6 +1424,8 @@ static int nfs4_set_client(struct nfs_server *server, const struct sockaddr *addr, const size_t addrlen, const char *ip_addr, + const struct sockaddr *srcaddr, + const size_t srcaddrlen, rpc_authflavor_t authflavour, int proto, const struct rpc_timeout *timeparms, u32 minorversion) @@ -1430,6 +1437,8 @@ static int nfs4_set_client(struct nfs_server *server, .rpc_ops = &nfs_v4_clientops, .proto = proto, .minorversion = minorversion, + .srcaddr = srcaddr, + .srcaddrlen = srcaddrlen, }; struct nfs_client *clp; int error; @@ -1604,6 +1613,8 @@ static int nfs4_init_server(struct nfs_server *server, (const struct sockaddr *)&data->nfs_server.address, data->nfs_server.addrlen, data->client_address, + (const struct sockaddr *)&data->srcaddr.address, + data->srcaddr.addrlen, data->auth_flavors[0], data->nfs_server.protocol, &timeparms, @@ -1701,6 +1712,8 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data, data->addr, data->addrlen, parent_client->cl_ipaddr, + (const struct sockaddr *)&parent_client->srcaddr, + parent_client->srcaddrlen, data->authflavor, parent_server->client->cl_xprt->prot, parent_server->client->cl_timeout,