svn commit: r212835 - stable/8/sys/fs/nfsclient

[Rick Macklem]

Author: rmacklem
Date: Sun Sep 19 01:41:49 2010
New Revision: 212835
URL: http://svn.freebsd.org/changeset/base/212835

Log:
  MFC: r212216
  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.

Modified:
  stable/8/sys/fs/nfsclient/nfs_clvnops.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clvnops.c	Sun Sep 19 01:18:03 2010	(r212834)
+++ stable/8/sys/fs/nfsclient/nfs_clvnops.c	Sun Sep 19 01:41:49 2010	(r212835)
@@ -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