From owner-svn-src-projects@freebsd.org Tue Apr 12 23:04:42 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 24802B0DC6D
for <svn-src-projects@mailman.ysv.freebsd.org>;
Tue, 12 Apr 2016 23:04:42 +0000 (UTC)
(envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id EB0B813D4;
Tue, 12 Apr 2016 23:04:41 +0000 (UTC)
(envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3CN4fgP082856;
Tue, 12 Apr 2016 23:04:41 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3CN4fei082855;
Tue, 12 Apr 2016 23:04:41 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201604122304.u3CN4fei082855@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to
rmacklem@FreeBSD.org using -f
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Tue, 12 Apr 2016 23:04:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r297891 - projects/pnfs-server/sys/fs/nfsclient
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Apr 2016 23:04:42 -0000
Author: rmacklem
Date: Tue Apr 12 23:04:40 2016
New Revision: 297891
URL: https://svnweb.freebsd.org/changeset/base/297891
Log:
Fix the call to nfscl_getmyip().
Modified:
projects/pnfs-server/sys/fs/nfsclient/nfs_clrpcops.c
Modified: projects/pnfs-server/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- projects/pnfs-server/sys/fs/nfsclient/nfs_clrpcops.c Tue Apr 12 23:03:37 2016 (r297890)
+++ projects/pnfs-server/sys/fs/nfsclient/nfs_clrpcops.c Tue Apr 12 23:04:40 2016 (r297891)
@@ -856,6 +856,7 @@ nfsrpc_setclient(struct nfsmount *nmp, s
u_int32_t lease;
static u_int32_t rev = 0;
struct nfsclds *dsp, *ndsp, *tdsp;
+ struct in6_addr a6;
if (nfsboottime.tv_sec == 0)
NFSSETBOOTTIME(nfsboottime);
@@ -916,7 +917,7 @@ nfsrpc_setclient(struct nfsmount *nmp, s
*tl = txdr_unsigned(NFS_CALLBCKPROG);
callblen = strlen(nfsv4_callbackaddr);
if (callblen == 0)
- cp = nfscl_getmyip(nmp, &isinet6);
+ cp = nfscl_getmyip(nmp, &a6, &isinet6);
if (nfscl_enablecallb && nfs_numnfscbd > 0 &&
(callblen > 0 || cp != NULL)) {
port = htons(nfsv4_cbport);