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

[Rick Macklem]

Author: rmacklem
Date: Mon Sep 27 01:41:39 2010
New Revision: 213189
URL: http://svn.freebsd.org/changeset/base/213189

Log:
  MFC: r212362
  Fix the experimental NFS client so that it doesn't panic when
  NFSv2,3 byte range locking is attempted. A fix that allows the
  nlm_advlock() to work with both clients is in progress, but
  may take a while. As such, I am doing this commit so that
  the kernel doesn't panic in the meantime.

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 26 22:11:41 2010	(r213188)
+++ stable/8/sys/fs/nfsclient/nfs_clvnops.c	Mon Sep 27 01:41:39 2010	(r213189)
@@ -2939,8 +2939,10 @@ nfs_advlock(struct vop_advlock_args *ap)
 		} else {
 			if (ncl_advlock_p)
 				error = ncl_advlock_p(ap);
-			else
+			else {
+				VOP_UNLOCK(vp, 0);
 				error = ENOLCK;
+			}
 		}
 	}
 	return (error);