4171 clean up spa_feature_*() interfaces
4172 implement extensible_dataset feature for use by other zpool features
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>

          --- old/usr/src/common/zfs/zfeature_common.h
          +++ new/usr/src/common/zfs/zfeature_common.h

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright (c) 2013 by Delphix. All rights reserved.
  24   24   * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  25   25   * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  26   26   */
  27   27  
  28   28  #ifndef _ZFEATURE_COMMON_H
  29   29  #define _ZFEATURE_COMMON_H
  30   30  

  31   31  #include <sys/fs/zfs.h>
  32   32  #include <sys/inttypes.h>
  33   33  #include <sys/types.h>
  34   34  
  35   35  #ifdef  __cplusplus
  36   36  extern "C" {
  37   37  #endif
  38   38  
  39   39  struct zfeature_info;
  40   40  
       41 +typedef enum spa_feature {
       42 +        SPA_FEATURE_NONE = -1,
       43 +        SPA_FEATURE_ASYNC_DESTROY,
       44 +        SPA_FEATURE_EMPTY_BPOBJ,
       45 +        SPA_FEATURE_LZ4_COMPRESS,
       46 +        SPA_FEATURE_MULTI_VDEV_CRASH_DUMP,
       47 +        SPA_FEATURE_SPACEMAP_HISTOGRAM,
       48 +        SPA_FEATURE_EXTENSIBLE_DATASET,
       49 +        SPA_FEATURES
       50 +} spa_feature_t;
       51 +
  41   52  typedef struct zfeature_info {
       53 +        spa_feature_t fi_feature;
  42   54          const char *fi_uname;   /* User-facing feature name */
  43   55          const char *fi_guid;    /* On-disk feature identifier */
  44   56          const char *fi_desc;    /* Feature description */
  45   57          boolean_t fi_can_readonly; /* Can open pool readonly w/o support? */
  46   58          boolean_t fi_mos;       /* Is the feature necessary to read the MOS? */
  47      -        struct zfeature_info **fi_depends; /* array; null terminated */
       59 +        /* array of dependencies, terminated by SPA_FEATURE_NONE */
       60 +        const spa_feature_t *fi_depends;
  48   61  } zfeature_info_t;
  49   62  
  50   63  typedef int (zfeature_func_t)(zfeature_info_t *fi, void *arg);
  51   64  
  52   65  #define ZFS_FEATURE_DEBUG
  53   66  
  54      -enum spa_feature {
  55      -        SPA_FEATURE_ASYNC_DESTROY,
  56      -        SPA_FEATURE_EMPTY_BPOBJ,
  57      -        SPA_FEATURE_LZ4_COMPRESS,
  58      -        SPA_FEATURE_MULTI_VDEV_CRASH_DUMP,
  59      -        SPA_FEATURE_SPACEMAP_HISTOGRAM,
  60      -        SPA_FEATURES
  61      -} spa_feature_t;
  62      -
  63   67  extern zfeature_info_t spa_feature_table[SPA_FEATURES];
  64   68  
  65   69  extern boolean_t zfeature_is_valid_guid(const char *);
  66   70  
  67   71  extern boolean_t zfeature_is_supported(const char *);
  68      -extern int zfeature_lookup_guid(const char *, zfeature_info_t **res);
  69      -extern int zfeature_lookup_name(const char *, zfeature_info_t **res);
       72 +extern int zfeature_lookup_name(const char *name, spa_feature_t *res);
  70   73  
  71   74  extern void zpool_feature_init(void);
  72   75  
  73   76  #ifdef  __cplusplus
  74   77  }
  75   78  #endif
  76   79  
  77   80  #endif  /* _ZFEATURE_COMMON_H */
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX