From owner-svn-src-head@FreeBSD.ORG  Thu Jun  4 08:13:51 2009
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 9B8E6106564A;
	Thu,  4 Jun 2009 08:13:51 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8BCD38FC0C;
	Thu,  4 Jun 2009 08:13:51 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n548Dper081877;
	Thu, 4 Jun 2009 08:13:51 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n548DpVT081876;
	Thu, 4 Jun 2009 08:13:51 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200906040813.n548DpVT081876@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Thu, 4 Jun 2009 08:13:51 +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: r193432 - head/sys/nlm
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, 04 Jun 2009 08:13:52 -0000

Author: dfr
Date: Thu Jun  4 08:13:51 2009
New Revision: 193432
URL: http://svn.freebsd.org/changeset/base/193432

Log:
  Don't panic in nlm_record_lock if we get ENOENT from lf_advlockasync. This
  is likely to be because the file was just removed and in our context this is
  harmless.

Modified:
  head/sys/nlm/nlm_advlock.c

Modified: head/sys/nlm/nlm_advlock.c
==============================================================================
--- head/sys/nlm/nlm_advlock.c	Thu Jun  4 06:57:50 2009	(r193431)
+++ head/sys/nlm/nlm_advlock.c	Thu Jun  4 08:13:51 2009	(r193432)
@@ -716,8 +716,8 @@ nlm_record_lock(struct vnode *vp, int op
 	newfl.l_sysid = NLM_SYSID_CLIENT | sysid;
 
 	error = lf_advlockasync(&a, &vp->v_lockf, size);
-	KASSERT(error == 0, ("Failed to register NFS lock locally - error=%d",
-		error));
+	KASSERT(error == 0 || errno == ENOENT,
+	    ("Failed to register NFS lock locally - error=%d", error));
 }
 
 static int