svn commit: r212216 - head/sys/fs/nfsclient

[Rick Macklem]

Author: rmacklem
Date: Sun Sep  5 00:10:18 2010
New Revision: 212216
URL: http://svn.freebsd.org/changeset/base/212216

Log:
  Disable use of the NLM in the experimental NFS client, since
  it will crash the kernel because it uses the nfsmount and
  nfsnode structures of the regular NFS client.
  
  MFC after:	2 weeks

Modified:
  head/sys/fs/nfsclient/nfs_clvnops.c

Modified: head/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvnops.c	Sat Sep  4 23:53:47 2010	(r212215)
+++ head/sys/fs/nfsclient/nfs_clvnops.c	Sun Sep  5 00:10:18 2010	(r212216)
@@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$");
 
 extern struct nfsstats newnfsstats;
 MALLOC_DECLARE(M_NEWNFSREQ);
-vop_advlock_t	*ncl_advlock_p = nfs_dolock;
+vop_advlock_t	*ncl_advlock_p = NULL;
 
 /*
  * Ifdef for FreeBSD-current merged buffer cache. It is unfortunate that these