svn commit: r184764 - user/dfr/gssapi/7/sys/nfsclient

[Doug Rabson]

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];