--- - branch: MAIN date: Thu Nov 15 04:55:38 UTC 2018 files: - new: '1.4' old: '1.3' path: src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_misc.c pathrev: src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_misc.c@1.4 type: modified - new: '1.3' old: '1.2' path: src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa_impl.h pathrev: src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa_impl.h@1.3 type: modified id: 20181115T045538Z.2eac5e9146575aef24d0645676990335c0f8324a log: | Be consistent about _KERNEL vs _HARDKERNEL in zfs. As it happens, on x86 both _HARDKERNEL and _KERNEL get defined; see the conditional in sys/rump/Makefile.rump that _refrains_ from defining _RUMPKERNEL on x86. So the only version of this code that has been tested is the one with all of it included. But on, e.g., aarch64, we do not get _HARDKERNEL here, and the code fails to build because some things use the field struct spa::spa_deadman_cycid under _KERNEL when it is declared only under _HARDKERNEL. If there's a reason _not_ to use this in rump -- and it's not obvious to me why -- then all access to the field needs to agree to use _HARDKERNEL. module: src subject: 'CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs' unixtime: '1542257738' user: riastradh