From owner-svn-src-head@FreeBSD.ORG  Thu Sep  9 15:45:12 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 51C8E10656F5;
	Thu,  9 Sep 2010 15:45:12 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 39CCD8FC24;
	Thu,  9 Sep 2010 15:45:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o89FjB0g002227;
	Thu, 9 Sep 2010 15:45:11 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o89FjBOq002225;
	Thu, 9 Sep 2010 15:45:11 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201009091545.o89FjBOq002225@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Thu, 9 Sep 2010 15:45:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r212362 - head/sys/fs/nfsclient
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Sep 2010 15:45:12 -0000

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