Update core ZFS code from build 121 to build 141.

[zfs.git] / module / zfs / include / sys / uberblock_impl.h

diff --git a/module/zfs/include/sys/uberblock_impl.h b/module/zfs/include/sys/uberblock_impl.h
index 55a0dd5..6ab6aa3 100644 (file)
--- a/module/zfs/include/sys/uberblock_impl.h
+++ b/module/zfs/include/sys/uberblock_impl.h
@@ -19,15 +19,12 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #ifndef _SYS_UBERBLOCK_IMPL_H
 #define        _SYS_UBERBLOCK_IMPL_H
 
-#pragma ident  "%Z%%M% %I%     %E% SMI"
-
 #include <sys/uberblock.h>
 
 #ifdef __cplusplus
@@ -54,6 +51,9 @@ struct uberblock {
        uint64_t        ub_guid_sum;    /* sum of all vdev guids        */
        uint64_t        ub_timestamp;   /* UTC time of last sync        */
        blkptr_t        ub_rootbp;      /* MOS objset_phys_t            */
+
+       /* highest SPA_VERSION supported by software that wrote this txg */
+       uint64_t        ub_software_version;
 };
 
 #ifdef __cplusplus