Module Name: src
Committed By: haad
Date: Thu May 6 22:26:55 UTC 2010
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: dnode_sync.c
Log Message:
Fix zfs version 22 merge error.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c:1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c:1.4
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c:1.3 Sat Feb 27 23:43:53 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c Thu May 6 22:26:55 2010
@@ -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);
