svn commit: r194315 - user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Kip Macy]

Author: kmacy
Date: Tue Jun 16 23:57:51 2009
New Revision: 194315
URL: http://svn.freebsd.org/changeset/base/194315

Log:
  revert change - lock may already be held

Modified:
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c

Modified: user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	Tue Jun 16 23:29:52 2009	(r194314)
+++ user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c	Tue Jun 16 23:57:51 2009	(r194315)
@@ -621,16 +621,16 @@ dnode_hold_impl(objset_impl_t *os, uint6
 		}
 	}
 
-	rw_enter(&dn->dn_mtx, RW_READER);
+	mutex_enter(&dn->dn_mtx);
 	type = dn->dn_type;
 	if (dn->dn_free_txg ||
 	    ((flag & DNODE_MUST_BE_ALLOCATED) && type == DMU_OT_NONE) ||
 	    ((flag & DNODE_MUST_BE_FREE) && type != DMU_OT_NONE)) {
-		rw_exit(&dn->dn_mtx);
+		mutex_exit(&dn->dn_mtx);
 		dbuf_rele(db, FTAG);
 		return (type == DMU_OT_NONE ? ENOENT : EEXIST);
 	}
-	rw_exit(&dn->dn_mtx);
+	mutex_exit(&dn->dn_mtx);
 
 	if (refcount_add(&dn->dn_holds, tag) == 1)
 		dbuf_add_ref(db, dn);