Module Name: src
Committed By: martin
Date: Mon Aug 26 14:06:56 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: dnode.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #115):
external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c: revision 1.8
Add missing dmu_zfetch_fini() when dnode_create() lost the race.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.2.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.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.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c:1.7 src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c:1.7.2.1
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c:1.7 Sun May 26 10:21:00 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c Mon Aug 26 14:06:56 2019
@@ -447,6 +447,9 @@ dnode_create(objset_t *os, dnode_phys_t
if (dnh->dnh_dnode != NULL) {
/* Lost the allocation race. */
mutex_exit(&os->os_lock);
+#ifdef __NetBSD__
+ dmu_zfetch_fini(&dn->dn_zfetch);
+#endif
kmem_cache_free(dnode_cache, dn);
return (dnh->dnh_dnode);
}
