Print this page
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>

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/zpool/zpool_main.c
          +++ new/usr/src/cmd/zpool/zpool_main.c
↓ open down ↓ 14 lines elided ↑ open up ↑
  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) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24   * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  25      - * Copyright (c) 2012 by Delphix. All rights reserved.
       25 + * Copyright (c) 2013 by Delphix. All rights reserved.
  26   26   * Copyright (c) 2012 by Frederik Wessels. All rights reserved.
  27   27   * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved.
  28   28   */
  29   29  
  30   30  #include <assert.h>
  31   31  #include <ctype.h>
  32   32  #include <dirent.h>
  33   33  #include <errno.h>
  34   34  #include <fcntl.h>
  35   35  #include <libgen.h>
↓ open down ↓ 833 lines elided ↑ open up ↑
 869  869                  print_vdev_tree(NULL, poolname, nvroot, 0, B_FALSE);
 870  870                  if (num_logs(nvroot) > 0)
 871  871                          print_vdev_tree(NULL, "logs", nvroot, 0, B_TRUE);
 872  872  
 873  873                  ret = 0;
 874  874          } else {
 875  875                  /*
 876  876                   * Hand off to libzfs.
 877  877                   */
 878  878                  if (enable_all_pool_feat) {
 879      -                        int i;
      879 +                        spa_feature_t i;
 880  880                          for (i = 0; i < SPA_FEATURES; i++) {
 881  881                                  char propname[MAXPATHLEN];
 882  882                                  zfeature_info_t *feat = &spa_feature_table[i];
 883  883  
 884  884                                  (void) snprintf(propname, sizeof (propname),
 885  885                                      "feature@%s", feat->fi_uname);
 886  886  
 887  887                                  /*
 888  888                                   * Skip feature if user specified it manually
 889  889                                   * on the command line.
↓ open down ↓ 4305 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX