Module Name: src
Committed By: riastradh
Date: Wed Feb 19 17:05:06 UTC 2020
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: spa_history.c
Log Message:
Mark previous #ifdef __NetBSD__, per request from hannken.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.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/spa_history.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c:1.5 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c:1.6
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c:1.5 Wed Feb 19 16:11:19 2020
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c Wed Feb 19 17:05:06 2020
@@ -540,9 +540,17 @@ spa_history_log_internal_dd(dsl_dir_t *d
void
spa_history_log_version(spa_t *spa, const char *operation)
{
+#ifdef __NetBSD__
spa_history_log_internal(spa, operation, NULL,
"pool version %llu; software version %llu/%d; %s %s %s %s %s",
(u_longlong_t)spa_version(spa), SPA_VERSION, ZPL_VERSION,
utsname.sysname, utsname.nodename, utsname.release, utsname.version,
utsname.machine);
+#else
+ spa_history_log_internal(spa, operation, NULL,
+ "pool version %llu; software version %llu/%d; uts %s %s %s %s",
+ (u_longlong_t)spa_version(spa), SPA_VERSION, ZPL_VERSION,
+ utsname.nodename, utsname.release, utsname.version,
+ utsname.machine);
+#endif
}
