]> CyberLeo.Net >> Repos - FreeBSD/stable/8.git/commit
MFC r210044, r214622:
authormm <mm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Tue, 14 Dec 2010 15:33:59 +0000 (15:33 +0000)
committermm <mm@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Tue, 14 Dec 2010 15:33:59 +0000 (15:33 +0000)
commit7858a62c4ae007277acddd5db293602bacd46e7f
tree495b0c296a6889af5dde1b646e9af81a43718186
parent87c3de4bd6f4c8d2bfc6440136dcd01228be8722
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)

git-svn-id: svn://svn.freebsd.org/base/stable/8@216434 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
cddl/contrib/opensolaris/lib/libzpool/common/kernel.c