[src/netbsd-9]: src/external/cddl/osnet/dist/uts/common/fs/zfs Pull up follow...

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

details:   https://anonhg.NetBSD.org/src/rev/560031c2a4c2
branches:  netbsd-9
changeset: 462339:560031c2a4c2
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Aug 13 14:51:52 2019 +0000

description:
Pull up following revision(s) (requested by hannken in ticket #52):

        external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c: revision 1.5

Add missing "defined(__NetBSD__)" to make "zfs promote" work.

diffstat:

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

diffs (12 lines):

diff -r 460a70c3e93e -r 560031c2a4c2 external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c  Tue Aug 13 14:46:04 2019 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c  Tue Aug 13 14:51:52 2019 +0000
@@ -2796,7 +2796,7 @@
                ASSERT(!dsl_prop_hascb(ds));
        }
 
-#if defined(__FreeBSD__) && defined(_KERNEL)
+#if (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(_KERNEL)
        mutex_exit(&spa_namespace_lock);
 
        kmem_free(newname, MAXPATHLEN);