diff options
| author | Olaf Faaland <faaland1@llnl.gov> | 2019-03-28 20:30:57 +0000 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2019-04-03 14:42:53 -0400 |
| commit | e0f1c0afa46cc84d4b1e40124032a9a87310386e (patch) | |
| tree | 8aa10b26a7ae7380d42c5352be4dc06b0ed4cae0 /usr/src/lib/libzpool | |
| parent | c93ad993b7959fc974ed6f4a92fce6041d98bd11 (diff) | |
| download | illumos-joyent-e0f1c0afa46cc84d4b1e40124032a9a87310386e.tar.gz | |
10499 Multi-modifier protection (MMP)
Portions contributed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Portions contributed by: Tim Chase <tim@chase2k.com>
Portions contributed by: sanjeevbagewadi <sanjeev.bagewadi@gmail.com>
Portions contributed by: John L. Hammond <john.hammond@intel.com>
Portions contributed by: Giuseppe Di Natale <dinatale2@llnl.gov>
Portions contributed by: Prakash Surya <surya1@llnl.gov>
Reviewed by: George Melikov <mail@gmelikov.ru>
Reviewed by: Tom Caputi <tcaputi@datto.com>
Reviewed by: Kash Pande <kash@tripleback.net>
Reviewed by: loli10K <ezomori.nozomu@gmail.com>
Reviewed by: George Melikov <mail@gmelikov.ru>
Reviewed by: Tony Hutter <hutter2@llnl.gov>
Reviewed by: Gu Zheng <guzheng2331314@163.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Ned Bass <bass6@llnl.gov>
Reviewed by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Kody Kantor <kody.kantor@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib/libzpool')
| -rw-r--r-- | usr/src/lib/libzpool/Makefile.com | 4 | ||||
| -rw-r--r-- | usr/src/lib/libzpool/common/kernel.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com index 8106ab5c49..7177220324 100644 --- a/usr/src/lib/libzpool/Makefile.com +++ b/usr/src/lib/libzpool/Makefile.com @@ -21,7 +21,7 @@ # # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2013, 2016 by Delphix. All rights reserved. -# Copyright (c) 2018, Joyent, Inc. +# Copyright 2019, Joyent, Inc. # LIBRARY= libzpool.a @@ -69,7 +69,7 @@ C99LMODE= -Xc99=%all CFLAGS += $(CCGDEBUG) $(CCVERBOSE) $(CNOGLOBAL) CFLAGS64 += $(CCGDEBUG) $(CCVERBOSE) $(CNOGLOBAL) LDLIBS += -lcmdutils -lumem -lavl -lnvpair -lz -lc -lsysevent -lmd \ - -lfakekernel + -lfakekernel -lzfs CPPFLAGS.first = -I$(SRC)/lib/libfakekernel/common CPPFLAGS += $(INCS) -DDEBUG -D_FAKE_KERNEL diff --git a/usr/src/lib/libzpool/common/kernel.c b/usr/src/lib/libzpool/common/kernel.c index e74f14cc9b..fb14f88817 100644 --- a/usr/src/lib/libzpool/common/kernel.c +++ b/usr/src/lib/libzpool/common/kernel.c @@ -41,6 +41,7 @@ #include <sys/zmod.h> #include <sys/utsname.h> #include <sys/systeminfo.h> +#include <libzfs.h> extern void system_taskq_init(void); extern void system_taskq_fini(void); @@ -442,7 +443,7 @@ kernel_init(int mode) (double)physmem * sysconf(_SC_PAGE_SIZE) / (1ULL << 30)); (void) snprintf(hw_serial, sizeof (hw_serial), "%ld", - (mode & FWRITE) ? gethostid() : 0); + (mode & FWRITE) ? get_system_hostid() : 0); system_taskq_init(); |