Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Mark previous #if...



details:   https://anonhg.NetBSD.org/src/rev/00438fdfb8e2
branches:  trunk
changeset: 744964:00438fdfb8e2
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Feb 19 17:05:06 2020 +0000

description:
Mark previous #ifdef __NetBSD__, per request from hannken.

diffstat:

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

diffs (21 lines):

diff -r 86afa1ab31be -r 00438fdfb8e2 external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c  Wed Feb 19 16:11:19 2020 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c  Wed Feb 19 17:05:06 2020 +0000
@@ -540,9 +540,17 @@
 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
 }



Home | Main Index | Thread Index | Old Index