From owner-cvs-src-old@FreeBSD.ORG  Tue Dec 14 15:34:10 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5CBB510656C2
	for <cvs-src-old@freebsd.org>; Tue, 14 Dec 2010 15:34:10 +0000 (UTC)
	(envelope-from mm@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 497EE8FC1A
	for <cvs-src-old@freebsd.org>; Tue, 14 Dec 2010 15:34:10 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id oBEFYA3c005816
	for <cvs-src-old@freebsd.org>; Tue, 14 Dec 2010 15:34:10 GMT
	(envelope-from mm@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id oBEFYArn005815
	for cvs-src-old@freebsd.org; Tue, 14 Dec 2010 15:34:10 GMT
	(envelope-from mm@repoman.freebsd.org)
Message-Id: <201012141534.oBEFYArn005815@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	mm@repoman.freebsd.org using -f
From: Martin Matuska <mm@FreeBSD.org>
Date: Tue, 14 Dec 2010 15:33:59 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/cddl/contrib/opensolaris/lib/libzpool/common
	kernel.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Dec 2010 15:34:10 -0000

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