diff options
| author | Andrew Stormont <astormont@racktopsystems.com> | 2020-05-22 12:03:11 +0100 |
|---|---|---|
| committer | Andrew Stormont <astormont@racktopsystems.com> | 2020-08-31 11:01:33 +0100 |
| commit | c94be9439c4f0773ef60e2cec21d548359cfea20 (patch) | |
| tree | 0eb304ae5d1ab6393dcb45a5bc36ae5f5115d25b | |
| parent | ab26215b1a80ead55969e925a597044ad4185a34 (diff) | |
| download | illumos-joyent-c94be9439c4f0773ef60e2cec21d548359cfea20.tar.gz | |
12780 GRUB is broken after 11479
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Approved by: Garrett D'Amore <garrett@damore.org>
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/zfs-include/dmu_objset.h | 17 | ||||
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/zfs-include/zio.h | 4 |
2 files changed, 19 insertions, 2 deletions
diff --git a/usr/src/grub/grub-0.97/stage2/zfs-include/dmu_objset.h b/usr/src/grub/grub-0.97/stage2/zfs-include/dmu_objset.h index 8d1cf8ea33..5e3bd528e8 100644 --- a/usr/src/grub/grub-0.97/stage2/zfs-include/dmu_objset.h +++ b/usr/src/grub/grub-0.97/stage2/zfs-include/dmu_objset.h @@ -20,19 +20,32 @@ * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* + * Copyright 2020 RackTop Systems, Inc. + */ #ifndef _SYS_DMU_OBJSET_H #define _SYS_DMU_OBJSET_H +#define OBJSET_PHYS_SIZE_V1 1024 +#define OBJSET_PHYS_SIZE_V2 2048 +#define OBJSET_PHYS_SIZE_V3 4096 + typedef struct objset_phys { dnode_phys_t os_meta_dnode; zil_header_t os_zil_header; uint64_t os_type; uint64_t os_flags; - char os_pad[2048 - sizeof (dnode_phys_t)*3 - - sizeof (zil_header_t) - sizeof (uint64_t)*2]; + uint8_t os_portable_mac[ZIO_OBJSET_MAC_LEN]; + uint8_t os_local_mac[ZIO_OBJSET_MAC_LEN]; + char os_pad0[OBJSET_PHYS_SIZE_V2 - sizeof (dnode_phys_t)*3 - + sizeof (zil_header_t) - sizeof (uint64_t)*2 - + 2*ZIO_OBJSET_MAC_LEN]; dnode_phys_t os_userused_dnode; dnode_phys_t os_groupused_dnode; + dnode_phys_t os_projectused_dnode; + char os_pad1[OBJSET_PHYS_SIZE_V3 - OBJSET_PHYS_SIZE_V2 - + sizeof (dnode_phys_t)]; } objset_phys_t; #endif /* _SYS_DMU_OBJSET_H */ diff --git a/usr/src/grub/grub-0.97/stage2/zfs-include/zio.h b/usr/src/grub/grub-0.97/stage2/zfs-include/zio.h index 434a2f2ef7..87a40d5a37 100644 --- a/usr/src/grub/grub-0.97/stage2/zfs-include/zio.h +++ b/usr/src/grub/grub-0.97/stage2/zfs-include/zio.h @@ -22,6 +22,7 @@ */ /* * Copyright 2013 by Saso Kiselkov. All rights reserved. + * Copyright 2020 RackTop Systems, Inc. */ #ifndef _ZIO_H @@ -74,6 +75,9 @@ enum zio_checksum { ZIO_CHECKSUM_FUNCTIONS }; +/* macros defining encryption lengths */ +#define ZIO_OBJSET_MAC_LEN 32 + enum zio_compress { ZIO_COMPRESS_INHERIT = 0, ZIO_COMPRESS_ON, |