From owner-svn-src-stable@FreeBSD.ORG  Wed May 20 22:32:25 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AC7E11065670;
	Wed, 20 May 2009 22:32:25 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BA6A8FC1F;
	Wed, 20 May 2009 22:32:25 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4KMWPjK046416;
	Wed, 20 May 2009 22:32:25 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4KMWPJU046415;
	Wed, 20 May 2009 22:32:25 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905202232.n4KMWPJU046415@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 20 May 2009 22:32:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192494 - stable/7/sys/kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 May 2009 22:32:26 -0000

Author: kmacy
Date: Wed May 20 22:32:25 2009
New Revision: 192494
URL: http://svn.freebsd.org/changeset/base/192494

Log:
  MFC minimal zfs lock ordering for WITNESS
  
  (dnode -> dirty record -> dbuf)

Modified:
  stable/7/sys/kern/subr_witness.c

Modified: stable/7/sys/kern/subr_witness.c
==============================================================================
--- stable/7/sys/kern/subr_witness.c	Wed May 20 22:30:57 2009	(r192493)
+++ stable/7/sys/kern/subr_witness.c	Wed May 20 22:32:25 2009	(r192494)
@@ -397,6 +397,13 @@ static struct witness_order_list_entry o
 	{ "vnode interlock", &lock_class_mtx_sleep },
 	{ NULL, NULL },
 	/*
+	 * ZFS locking
+	 */
+	{ "dn->dn_mtx", &lock_class_sx },
+	{ "dr->dt.di.dr_mtx", &lock_class_sx },
+	{ "db->db_mtx", &lock_class_sx },
+	{ NULL, NULL },
+	/*
 	 * spin locks
 	 */
 #ifdef SMP