Module Name: src Committed By: hannken Date: Tue Aug 13 08:03:25 UTC 2019
Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: dsl_dataset.c Log Message: Add missing "defined(__NetBSD__)" to make "zfs promote" work. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.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/dsl_dataset.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c:1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c:1.5 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c:1.4 Wed May 22 08:45:32 2019 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c Tue Aug 13 08:03:25 2019 @@ -2796,7 +2796,7 @@ dsl_dataset_promote_sync(void *arg, dmu_ 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);