From patchwork Mon Jan 21 20:45:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 2014051 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 247543FDD2 for ; Mon, 21 Jan 2013 20:48:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755876Ab3AUUsH (ORCPT ); Mon, 21 Jan 2013 15:48:07 -0500 Received: from mail.candelatech.com ([208.74.158.172]:43633 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752250Ab3AUUsD (ORCPT ); Mon, 21 Jan 2013 15:48:03 -0500 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 r0LKkDwx022791 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 21 Jan 2013 12:46:15 -0800 From: greearb@candelatech.com To: linux-nfs@vger.kernel.org Cc: Ben Greear Subject: [RFC 08/13] nfs: Propagate src-addr in client code. Date: Mon, 21 Jan 2013 12:45:54 -0800 Message-Id: <1358801159-18829-9-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1358801159-18829-1-git-send-email-greearb@candelatech.com> References: <1358801159-18829-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 From: Ben Greear This ties the srcaddr supplied by mount to the rpc code. Signed-off-by: Ben Greear --- fs/nfs/client.c | 5 +++++ fs/nfs/nfs4client.c | 8 ++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index e5230fe..bb0a8ce 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -167,6 +167,8 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init) 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; @@ -594,6 +596,7 @@ int nfs_create_rpc_client(struct nfs_client *clp, .net = clp->cl_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, @@ -751,6 +754,8 @@ static int nfs_init_server(struct nfs_server *server, .addr = (const struct sockaddr *)&data->nfs_server.address, .addrlen = data->nfs_server.addrlen, .nfs_mod = nfs_mod, + .srcaddr = (const struct sockaddr *)&data->srcaddr.address, + .srcaddrlen = data->srcaddr.addrlen, .proto = data->nfs_server.protocol, .net = data->net, }; diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 7c4dc21..bdd5f3b 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -610,6 +610,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, struct net *net) @@ -622,6 +624,8 @@ static int nfs4_set_client(struct nfs_server *server, .proto = proto, .minorversion = minorversion, .net = net, + .srcaddr = srcaddr, + .srcaddrlen = srcaddrlen, }; struct nfs_client *clp; int error; @@ -796,6 +800,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, @@ -896,6 +902,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, rpc_protocol(parent_server->client), parent_server->client->cl_timeout,