Date: Tue, 8 Aug 2017 19:47:11 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r322273 - stable/11/sys/kern Message-ID: <201708081947.v78JlBXn078010@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Tue Aug 8 19:47:11 2017 New Revision: 322273 URL: https://svnweb.freebsd.org/changeset/base/322273 Log: MFC r321884, r321896: Fix a witness assertion that fires when a lock type's class changes. Modified: stable/11/sys/kern/subr_witness.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/subr_witness.c ============================================================================== --- stable/11/sys/kern/subr_witness.c Tue Aug 8 19:36:34 2017 (r322272) +++ stable/11/sys/kern/subr_witness.c Tue Aug 8 19:47:11 2017 (r322273) @@ -1850,12 +1850,14 @@ enroll(const char *description, struct lock_class *loc return (w); found: w->w_refcount++; + if (w->w_refcount == 1) + w->w_class = lock_class; mtx_unlock_spin(&w_mtx); if (lock_class != w->w_class) kassert_panic( - "lock (%s) %s does not match earlier (%s) lock", - description, lock_class->lc_name, - w->w_class->lc_name); + "lock (%s) %s does not match earlier (%s) lock", + description, lock_class->lc_name, + w->w_class->lc_name); return (w); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708081947.v78JlBXn078010>