UBUNTU: SAUCE: (noup) Update spl to 0.7.3-1ubuntu1, zfs to 0.7.3-1ubuntu1

[mirror_ubuntu-bionic-kernel.git] / zfs / include / zfeature_common.h

diff --git a/zfs/include/zfeature_common.h b/zfs/include/zfeature_common.h
index e383c4ff7887a7bb6b0d585e3fe47174d4379882..25d680ffcebd9848c3d0d23841d3a5cb2ac02e65 100644 (file)
--- a/zfs/include/zfeature_common.h
+++ b/zfs/include/zfeature_common.h
@@ -20,8 +20,9 @@
  */
 
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
 
 #ifndef _ZFEATURE_COMMON_H
@@ -42,6 +43,7 @@ typedef enum spa_feature {
        SPA_FEATURE_ASYNC_DESTROY,
        SPA_FEATURE_EMPTY_BPOBJ,
        SPA_FEATURE_LZ4_COMPRESS,
+       SPA_FEATURE_MULTI_VDEV_CRASH_DUMP,
        SPA_FEATURE_SPACEMAP_HISTOGRAM,
        SPA_FEATURE_ENABLED_TXG,
        SPA_FEATURE_HOLE_BIRTH,
@@ -50,20 +52,33 @@ typedef enum spa_feature {
        SPA_FEATURE_BOOKMARKS,
        SPA_FEATURE_FS_SS_LIMIT,
        SPA_FEATURE_LARGE_BLOCKS,
+       SPA_FEATURE_LARGE_DNODE,
+       SPA_FEATURE_SHA512,
+       SPA_FEATURE_SKEIN,
+       SPA_FEATURE_EDONR,
+       SPA_FEATURE_USEROBJ_ACCOUNTING,
        SPA_FEATURES
 } spa_feature_t;
 
 #define        SPA_FEATURE_DISABLED    (-1ULL)
 
+typedef enum zfeature_flags {
+       /* Can open pool readonly even if this feature is not supported. */
+       ZFEATURE_FLAG_READONLY_COMPAT =         (1 << 0),
+       /* Is this feature necessary to read the MOS? */
+       ZFEATURE_FLAG_MOS =                     (1 << 1),
+       /* Activate this feature at the same time it is enabled. */
+       ZFEATURE_FLAG_ACTIVATE_ON_ENABLE =      (1 << 2),
+       /* Each dataset has a field set if it has ever used this feature. */
+       ZFEATURE_FLAG_PER_DATASET =             (1 << 3)
+} zfeature_flags_t;
+
 typedef struct zfeature_info {
        spa_feature_t fi_feature;
        const char *fi_uname;   /* User-facing feature name */
        const char *fi_guid;    /* On-disk feature identifier */
        const char *fi_desc;    /* Feature description */
-       boolean_t fi_can_readonly; /* Can open pool readonly w/o support? */
-       boolean_t fi_mos;       /* Is the feature necessary to read the MOS? */
-       /* Activate this feature at the same time it is enabled */
-       boolean_t fi_activate_on_enable;
+       zfeature_flags_t fi_flags;
        /* array of dependencies, terminated by SPA_FEATURE_NONE */
        const spa_feature_t *fi_depends;
 } zfeature_info_t;