[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Fix zfs version 2...

[haad <haad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/48a645e44aa0
branches:  trunk
changeset: 754635:48a645e44aa0
user:      haad <haad%NetBSD.org@localhost>
date:      Thu May 06 22:26:55 2010 +0000

description:
Fix zfs version 22 merge error.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c |  5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diffs (15 lines):

diff -r 70db4b14f4ab -r 48a645e44aa0 external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c   Thu May 06 21:50:16 2010 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c   Thu May 06 22:26:55 2010 +0000
@@ -437,11 +437,6 @@
                        ASSERT(db->db_blkid == DB_BONUS_BLKID ||
                            dr->dt.dl.dr_data == db->db_buf);
                        dbuf_unoverride(dr);
-                       mutex_exit(&db->db_mtx);
-               } else {
-                       mutex_exit(&db->db_mtx);
-                       mutex_destroy(&dr->dt.di.dr_mtx);
-                       dnode_undirty_dbufs(&dr->dt.di.dr_children);
                }
                kmem_free(dr, sizeof (dbuf_dirty_record_t));
                dbuf_rele_and_unlock(db, (void *)(uintptr_t)txg);