From 829f9251cf03f1b385a46960539380dd70555270 Mon Sep 17 00:00:00 2001 From: Serapheim Dimitropoulos Date: Thu, 13 Jul 2017 07:32:53 -0700 Subject: 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 Reviewed by: Matthew Ahrens Reviewed by: Brian Behlendorf Reviewed by: Olaf Faaland Approved by: Gordon Ross Ported-by: Giuseppe Di Natale OpenZFS-issue: https://www.illumos.org/issues/8491 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/d84fa5f Closes #6390 --- include/sys/uberblock_impl.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') 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 -- cgit v1.2.3