From owner-svn-src-head@FreeBSD.ORG Thu Jun 4 11:37:26 2009 Return-Path: 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 8F1921065675; Thu, 4 Jun 2009 11:37:26 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.221.173]) by mx1.freebsd.org (Postfix) with ESMTP id 579E88FC1D; Thu, 4 Jun 2009 11:37:23 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by qyk3 with SMTP id 3so1053728qyk.3 for ; Thu, 04 Jun 2009 04:37:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=0m3WK/bBu1nprCojbWi768Zyq3kenfI6bFrdgPAQwTM=; b=cukJdq2VuzqK7tCFp4HdVCTNb8aN/oYz2f/hE+7wk30qQwWS3+UoGAMrv8Cf29TPLm Rj2pV3lJUzTK6fa8am7m6mXG6k06OWpSZh4LRkKAqxhQtdtkC0rpuDvWcigt//5pJ8wX ATzfFV18JUfo1Npu4UevgQqL141aKAXWoqUPY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=utMcEeU2SYKhobk20qZj62svj2GlQK5+SHX0d55AQCdx2prPUdQ1o4L6e9QArrUjPD G9LcVfvTyFAnkx2t9doy9HAO2nR++ACvGFhFFzTUh3cJpPeciqF+gj5HfW5t2Y/ZyKYZ gjjIRYJVtOvMt3asTcqJmjJfIWtV7h/BHWmBI= MIME-Version: 1.0 Sender: adrian.chadd@gmail.com Received: by 10.229.81.144 with SMTP id x16mr610604qck.69.1244114011299; Thu, 04 Jun 2009 04:13:31 -0700 (PDT) In-Reply-To: <200906040813.n548DpVT081876@svn.freebsd.org> References: <200906040813.n548DpVT081876@svn.freebsd.org> Date: Thu, 4 Jun 2009 19:13:31 +0800 X-Google-Sender-Auth: 81d06dd68cbed3c5 Message-ID: From: Adrian Chadd To: Doug Rabson Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jun 2009 11:37:27 -0000 This broke the build. errno? adrian 2009/6/4 Doug Rabson : > Author: dfr > Date: Thu Jun =A04 08:13:51 2009 > New Revision: 193432 > URL: http://svn.freebsd.org/changeset/base/193432 > > Log: > =A0Don't panic in nlm_record_lock if we get ENOENT from lf_advlockasync. = This > =A0is likely to be because the file was just removed and in our context t= his is > =A0harmless. > > Modified: > =A0head/sys/nlm/nlm_advlock.c > > Modified: head/sys/nlm/nlm_advlock.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/nlm/nlm_advlock.c =A0Thu Jun =A04 06:57:50 2009 =A0 =A0 =A0 = =A0(r193431) > +++ head/sys/nlm/nlm_advlock.c =A0Thu Jun =A04 08:13:51 2009 =A0 =A0 =A0 = =A0(r193432) > @@ -716,8 +716,8 @@ nlm_record_lock(struct vnode *vp, int op > =A0 =A0 =A0 =A0newfl.l_sysid =3D NLM_SYSID_CLIENT | sysid; > > =A0 =A0 =A0 =A0error =3D lf_advlockasync(&a, &vp->v_lockf, size); > - =A0 =A0 =A0 KASSERT(error =3D=3D 0, ("Failed to register NFS lock local= ly - error=3D%d", > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 error)); > + =A0 =A0 =A0 KASSERT(error =3D=3D 0 || errno =3D=3D ENOENT, > + =A0 =A0 =A0 =A0 =A0 ("Failed to register NFS lock locally - error=3D%d"= , error)); > =A0} > > =A0static int >