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

[Rick Macklem]

Author: rmacklem
Date: Thu Sep  9 15:45:11 2010
New Revision: 212362
URL: http://svn.freebsd.org/changeset/base/212362

Log:
  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.
  
  Submitted by:	jh
  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	Thu Sep  9 13:38:36 2010	(r212361)
+++ head/sys/fs/nfsclient/nfs_clvnops.c	Thu Sep  9 15:45:11 2010	(r212362)
@@ -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);