From owner-svn-src-head@FreeBSD.ORG  Tue Jan 17 06:23:26 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8ECA0106564A;
	Tue, 17 Jan 2012 06:23:26 +0000 (UTC)
	(envelope-from pluknet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 78B0D8FC08;
	Tue, 17 Jan 2012 06:23:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0H6NQhA070851;
	Tue, 17 Jan 2012 06:23:26 GMT (envelope-from pluknet@svn.freebsd.org)
Received: (from pluknet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0H6NQIF070849;
	Tue, 17 Jan 2012 06:23:26 GMT (envelope-from pluknet@svn.freebsd.org)
Message-Id: <201201170623.q0H6NQIF070849@svn.freebsd.org>
From: Sergey Kandaurov <pluknet@FreeBSD.org>
Date: Tue, 17 Jan 2012 06:23:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230256 -
	head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jan 2012 06:23:26 -0000

Author: pluknet
Date: Tue Jan 17 06:23:25 2012
New Revision: 230256
URL: http://svn.freebsd.org/changeset/base/230256

Log:
  Fix the "lock &zrl->zr_mtx already initialized" assertion by initializing
  the allocated memory before calling mtx_init(9) on mtx pointing to it.
  Otherwize, random contents of uninitialized memory might occasionally
  trigger the assertion.
  
  Reported by:	Pavel Polyakov <bsd kobyla org>
  Reviewed by:	pjd
  MFC after:	1 week

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	Tue Jan 17 04:45:11 2012	(r230255)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	Tue Jan 17 06:23:25 2012	(r230256)
@@ -1077,7 +1077,7 @@ dnode_hold_impl(objset_t *os, uint64_t o
 	if (children_dnodes == NULL) {
 		int i;
 		dnode_children_t *winner;
-		children_dnodes = kmem_alloc(sizeof (dnode_children_t) +
+		children_dnodes = kmem_zalloc(sizeof (dnode_children_t) +
 		    (epb - 1) * sizeof (dnode_handle_t), KM_SLEEP);
 		children_dnodes->dnc_count = epb;
 		dnh = &children_dnodes->dnc_children[0];