diff options
| author | Serapheim Dimitropoulos <[email protected]> | 2017-07-13 07:32:53 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-07-24 13:47:51 -0400 |
| commit | 829f9251cf03f1b385a46960539380dd70555270 (patch) | |
| tree | 7a98c2bd7bd538032a0fc4f9eead56f794ab714a /include | |
| parent | 36ba27e9e07b35340ba388e6624e65995595ed92 (diff) | |
OpenZFS 8491 - uberblock on-disk padding to reserve space for smoothly merging zpool checkpoint & MMP in ZFS
The zpool checkpoint feature in DxOS added a new field in the uberblock.
The Multi-Modifier Protection Pull Request from ZoL adds three new fields
in the uberblock (Reference: https://github.com/zfsonlinux/zfs/pull/6279).
As these two changes come from two different sources and once upstreamed
and deployed will introduce an incompatibility with each other we want
to upstream a change that will reserve the padding for both of them so
integration goes smoothly and everyone gets both features.
Porting Notes: Preserved MMP comments in uberblock struct.
Authored by: Serapheim Dimitropoulos <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Brian Behlendorf <[email protected]>
Reviewed by: Olaf Faaland <[email protected]>
Approved by: Gordon Ross <[email protected]>
Ported-by: Giuseppe Di Natale <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/8491
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/d84fa5f
Closes #6390
Diffstat (limited to 'include')
| -rw-r--r-- | include/sys/uberblock_impl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sys/uberblock_impl.h b/include/sys/uberblock_impl.h index 9fdc70b91..08eeabdda 100644 --- a/include/sys/uberblock_impl.h +++ b/include/sys/uberblock_impl.h @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017 by Delphix. All rights reserved. */ #ifndef _SYS_UBERBLOCK_IMPL_H @@ -60,6 +61,7 @@ struct uberblock { uint64_t ub_mmp_magic; /* MMP_MAGIC */ uint64_t ub_mmp_delay; /* nanosec since last MMP write */ uint64_t ub_mmp_seq; /* reserved for sequence number */ + uint64_t ub_checkpoint_txg; }; #ifdef __cplusplus |