From owner-svn-src-user@FreeBSD.ORG  Sat Nov  8 11:46:41 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2A2AD106572B;
	Sat,  8 Nov 2008 11:46:41 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0FD8F8FC0A;
	Sat,  8 Nov 2008 11:46:41 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA8BkeDM011082;
	Sat, 8 Nov 2008 11:46:40 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA8BkewT011081;
	Sat, 8 Nov 2008 11:46:40 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200811081146.mA8BkewT011081@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Sat, 8 Nov 2008 11:46:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184764 - user/dfr/gssapi/7/sys/nfsclient
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Nov 2008 11:46:41 -0000

Author: dfr
Date: Sat Nov  8 11:46:40 2008
New Revision: 184764
URL: http://svn.freebsd.org/changeset/base/184764

Log:
  Fix nmount.

Modified:
  user/dfr/gssapi/7/sys/nfsclient/nfs_vfsops.c

Modified: user/dfr/gssapi/7/sys/nfsclient/nfs_vfsops.c
==============================================================================
--- user/dfr/gssapi/7/sys/nfsclient/nfs_vfsops.c	Sat Nov  8 11:45:11 2008	(r184763)
+++ user/dfr/gssapi/7/sys/nfsclient/nfs_vfsops.c	Sat Nov  8 11:46:40 2008	(r184764)
@@ -795,9 +795,33 @@ static const char *nfs_opts[] = { "from"
 static int
 nfs_mount(struct mount *mp, struct thread *td)
 {
+	struct nfs_args args = {
+	    .version = NFS_ARGSVERSION,
+	    .addr = NULL,
+	    .addrlen = sizeof (struct sockaddr_in),
+	    .sotype = SOCK_STREAM,
+	    .proto = 0,
+	    .fh = NULL,
+	    .fhsize = 0,
+	    .flags = NFSMNT_RESVPORT,
+	    .wsize = NFS_WSIZE,
+	    .rsize = NFS_RSIZE,
+	    .readdirsize = NFS_READDIRSIZE,
+	    .timeo = 10,
+	    .retrans = NFS_RETRANS,
+	    .maxgrouplist = NFS_MAXGRPS,
+	    .readahead = NFS_DEFRAHEAD,
+	    .wcommitsize = 0,			/* was: NQ_DEFLEASE */
+	    .deadthresh = NFS_MAXDEADTHRESH,	/* was: NQ_DEADTHRESH */
+	    .hostname = NULL,
+	    /* args version 4 */
+	    .acregmin = NFS_MINATTRTIMO,
+	    .acregmax = NFS_MAXATTRTIMO,
+	    .acdirmin = NFS_MINDIRATTRTIMO,
+	    .acdirmax = NFS_MAXDIRATTRTIMO,
+	};
 	int error, ret, has_nfs_args_opt;
 	int has_addr_opt, has_fh_opt, has_hostname_opt;
-	struct nfs_args args;
 	struct sockaddr *nam;
 	struct vnode *vp;
 	char hst[MNAMELEN];