summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerapheim Dimitropoulos <serapheim@delphix.com>2017-07-13 07:32:53 -0700
committerPrakash Surya <prakash.surya@delphix.com>2017-07-21 17:27:52 -0700
commit79c2b812ee2010ebf20fdd92dc5f06b59000a94c (patch)
tree2f7413cd0b61e5791a3a52e4d964d1419d4baf92
parent4ac9cfccca470985479d54f113ab420ee8215120 (diff)
downloadillumos-gate-79c2b812ee2010ebf20fdd92dc5f06b59000a94c.tar.gz
8491 uberblock on-disk padding to reserve space for smoothly merging zpool checkpoint & MMP in ZFS
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed by: Olaf Faaland <faaland1@llnl.gov> Approved by: Gordon Ross <gwr@nexenta.com>
-rw-r--r--usr/src/uts/common/fs/zfs/sys/uberblock_impl.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/usr/src/uts/common/fs/zfs/sys/uberblock_impl.h b/usr/src/uts/common/fs/zfs/sys/uberblock_impl.h
index 6ab6aa3135..2d5e845fcd 100644
--- a/usr/src/uts/common/fs/zfs/sys/uberblock_impl.h
+++ b/usr/src/uts/common/fs/zfs/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
@@ -54,6 +55,12 @@ struct uberblock {
/* highest SPA_VERSION supported by software that wrote this txg */
uint64_t ub_software_version;
+
+ /* These fields are reserved for features that are under development: */
+ uint64_t ub_mmp_magic;
+ uint64_t ub_mmp_delay;
+ uint64_t ub_mmp_seq;
+ uint64_t ub_checkpoint_txg;
};
#ifdef __cplusplus