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/uts/common/fs/zfs/sys/zfeature.h
          +++ new/usr/src/uts/common/fs/zfs/sys/zfeature.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   */
  25   25  
  26   26  #ifndef _SYS_ZFEATURE_H
  27   27  #define _SYS_ZFEATURE_H
  28   28  
  29   29  #include <sys/nvpair.h>
       30 +#include <sys/txg.h>
  30   31  #include "zfeature_common.h"
  31   32  
  32   33  #ifdef  __cplusplus
  33   34  extern "C" {
  34   35  #endif
  35   36  
  36   37  struct spa;
  37   38  struct dmu_tx;
  38   39  struct objset;
  39   40  
  40      -extern boolean_t feature_is_supported(struct objset *os, uint64_t obj,
  41      -    uint64_t desc_obj, nvlist_t *unsup_feat, nvlist_t *enabled_feat);
  42      -
  43   41  extern void spa_feature_create_zap_objects(struct spa *, struct dmu_tx *);
  44      -extern void spa_feature_enable(struct spa *, zfeature_info_t *,
       42 +extern void spa_feature_enable(struct spa *, spa_feature_t,
  45   43      struct dmu_tx *);
  46      -extern void spa_feature_incr(struct spa *, zfeature_info_t *, struct dmu_tx *);
  47      -extern void spa_feature_decr(struct spa *, zfeature_info_t *, struct dmu_tx *);
  48      -extern boolean_t spa_feature_is_enabled(struct spa *, zfeature_info_t *);
  49      -extern boolean_t spa_feature_is_active(struct spa *, zfeature_info_t *);
  50      -extern int spa_feature_get_refcount(struct spa *, zfeature_info_t *);
       44 +extern void spa_feature_incr(struct spa *, spa_feature_t, struct dmu_tx *);
       45 +extern void spa_feature_decr(struct spa *, spa_feature_t, struct dmu_tx *);
       46 +extern boolean_t spa_feature_is_enabled(struct spa *, spa_feature_t);
       47 +extern boolean_t spa_feature_is_active(struct spa *, spa_feature_t);
       48 +extern uint64_t spa_feature_refcount(spa_t *, spa_feature_t, uint64_t);
       49 +extern boolean_t spa_features_check(spa_t *, boolean_t, nvlist_t *, nvlist_t *);
  51   50  
       51 +/*
       52 + * These functions are only exported for zhack and zdb; normal callers should
       53 + * use the above interfaces.
       54 + */
       55 +extern int feature_get_refcount(struct spa *, zfeature_info_t *, uint64_t *);
       56 +extern void feature_enable_sync(struct spa *, zfeature_info_t *,
       57 +    struct dmu_tx *);
       58 +extern void feature_sync(struct spa *, zfeature_info_t *, uint64_t,
       59 +    struct dmu_tx *);
       60 +
  52   61  #ifdef  __cplusplus
  53   62  }
  54   63  #endif
  55   64  
  56   65  #endif /* _SYS_ZFEATURE_H */
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX