Date: Tue, 14 Dec 2010 15:33:59 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/cddl/contrib/opensolaris/lib/libzpool/common kernel.c Message-ID: <201012141534.oBEFYArn005815@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
mm 2010-12-14 15:33:59 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_8)
cddl/contrib/opensolaris/lib/libzpool/common kernel.c
Log:
SVN rev 216434 on 2010-12-14 15:33:59Z by mm
MFC r210044, r214622:
MFC r210044 (pjd):
MFp4 180933:
Initialize rw_count properly so that zdb(8) doesn't trigger assertion in
rw_enter():
ASSERT(rwlp->rw_count == 0);
While here, assert that rw_count is 0 when destroying the lock.
MFC r214622 (pjd):
1. Remove invalid assertion.
2. Properly recalculate delta in case pthread_cond_timedwait() is interrupted.
3. Style fix.
Reported by: [1] App Deb <appdebgr@gmail.com>
Approved by: re (kib), pjd, delphij (mentor)
Revision Changes Path
1.6.2.2 +5 -3 src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012141534.oBEFYArn005815>