Date: Sat, 4 Nov 2017 12:04:56 -0700 From: Conrad Meyer <cem@freebsd.org> To: Konstantin Belousov <kib@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r325386 - head/sys/kern Message-ID: <CAG6CVpUaXSX26Bc839kn96EXnUjtGyQ3_eNJPhsRB%2Bv6G6gH1Q@mail.gmail.com> In-Reply-To: <201711041049.vA4AnZUE096709@repo.freebsd.org> References: <201711041049.vA4AnZUE096709@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a functional change, because MPASS (via KASSERT) is only enabled on DEBUG kernels. Ideally we would have a kind of ASSERT that worked on NODEBUG kernels. Best, Conrad On Sat, Nov 4, 2017 at 3:49 AM, Konstantin Belousov <kib@freebsd.org> wrote: > Author: kib > Date: Sat Nov 4 10:49:34 2017 > New Revision: 325386 > URL: https://svnweb.freebsd.org/changeset/base/325386 > > Log: > Convert explicit panic() call to assert. > > Based on github pull request: #113 > Submitted by: pmarillo@github > MFC after: 1 week > > Modified: > head/sys/kern/kern_umtx.c > > Modified: head/sys/kern/kern_umtx.c > ============================================================================== > --- head/sys/kern/kern_umtx.c Sat Nov 4 10:10:34 2017 (r325385) > +++ head/sys/kern/kern_umtx.c Sat Nov 4 10:49:34 2017 (r325386) > @@ -1579,8 +1579,7 @@ umtx_pi_setowner(struct umtx_pi *pi, struct thread *ow > > uq_owner = owner->td_umtxq; > mtx_assert(&umtx_lock, MA_OWNED); > - if (pi->pi_owner != NULL) > - panic("pi_owner != NULL"); > + MPASS(pi->pi_owner == NULL); > pi->pi_owner = owner; > TAILQ_INSERT_TAIL(&uq_owner->uq_pi_contested, pi, pi_link); > } >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG6CVpUaXSX26Bc839kn96EXnUjtGyQ3_eNJPhsRB%2Bv6G6gH1Q>