From patchwork Fri Jul 15 17:55:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 980012 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 p6FHvZUE030216 for ; Fri, 15 Jul 2011 17:57:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755764Ab1GOR5G (ORCPT ); Fri, 15 Jul 2011 13:57:06 -0400 Received: from mail.candelatech.com ([208.74.158.172]:58942 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755798Ab1GOR5D (ORCPT ); Fri, 15 Jul 2011 13:57:03 -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 p6FHuIUb019371 (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) 03/12] nfs: Add srcaddr member to nfs_client. Date: Fri, 15 Jul 2011 10:55:59 -0700 Message-Id: <1310752568-21280-4-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:57:35 +0000 (UTC) From: Ben Greear Signed-off-by: Ben Greear --- :100644 100644 2a55347... 93979a9... M fs/nfs/internal.h :100644 100644 ce40e5c... cb41131... M fs/nfs/super.c :100644 100644 87694ca... 9db4473... M include/linux/nfs_fs_sb.h fs/nfs/internal.h | 5 +++++ fs/nfs/super.c | 2 ++ include/linux/nfs_fs_sb.h | 4 ++++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 2a55347..93979a9 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -107,6 +107,11 @@ struct nfs_parsed_mount_data { struct { struct sockaddr_storage address; size_t addrlen; + } srcaddr; + + struct { + struct sockaddr_storage address; + size_t addrlen; char *hostname; u32 version; int port; diff --git a/fs/nfs/super.c b/fs/nfs/super.c index ce40e5c..cb41131 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -904,6 +904,8 @@ static struct nfs_parsed_mount_data *nfs_alloc_parsed_mount_data(unsigned int ve data->auth_flavor_len = 1; data->version = version; data->minorversion = 0; + data->srcaddr.address.ss_family = AF_UNSPEC; + data->srcaddr.addrlen = sizeof(data->srcaddr.address); } return data; } diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index 87694ca..9db4473 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h @@ -80,6 +80,10 @@ struct nfs_client { struct list_head cl_layouts; #endif /* CONFIG_NFS_V4 */ + /* If we should bind to a local IP, it should be specified below. */ + struct sockaddr_storage srcaddr; + size_t srcaddrlen; + #ifdef CONFIG_NFS_FSCACHE struct fscache_cookie *fscache; /* client index cache cookie */ #endif