Date: Thu, 4 Jun 2009 19:13:31 +0800 From: Adrian Chadd <adrian@freebsd.org> To: Doug Rabson <dfr@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r193432 - head/sys/nlm Message-ID: <d763ac660906040413x1baff967p20657bf48edea625@mail.gmail.com> In-Reply-To: <200906040813.n548DpVT081876@svn.freebsd.org> References: <200906040813.n548DpVT081876@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This broke the build. errno? adrian 2009/6/4 Doug Rabson <dfr@freebsd.org>: > 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 >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?d763ac660906040413x1baff967p20657bf48edea625>