Illumos #1948: zpool list should show more detailed pool info

[mirror_zfs.git] / module / zcommon / zpool_prop.c

diff --git a/module/zcommon/zpool_prop.c b/module/zcommon/zpool_prop.c
index d57dcfb638b0f24054246b32ed227ab1a713c38e..303edcefcaafc1f10985872214c40112acc69612 100644 (file)
--- a/module/zcommon/zpool_prop.c
+++ b/module/zcommon/zpool_prop.c
@@ -19,8 +19,9 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
 #include <sys/zio.h>
@@ -64,48 +65,65 @@ zpool_prop_init(void)
        };
 
        /* string properties */
-       register_string(ZPOOL_PROP_ALTROOT, "altroot", NULL, PROP_DEFAULT,
+       zprop_register_string(ZPOOL_PROP_ALTROOT, "altroot", NULL, PROP_DEFAULT,
            ZFS_TYPE_POOL, "<path>", "ALTROOT");
-       register_string(ZPOOL_PROP_BOOTFS, "bootfs", NULL, PROP_DEFAULT,
+       zprop_register_string(ZPOOL_PROP_BOOTFS, "bootfs", NULL, PROP_DEFAULT,
            ZFS_TYPE_POOL, "<filesystem>", "BOOTFS");
-       register_string(ZPOOL_PROP_CACHEFILE, "cachefile", NULL, PROP_DEFAULT,
-           ZFS_TYPE_POOL, "<file> | none", "CACHEFILE");
+       zprop_register_string(ZPOOL_PROP_CACHEFILE, "cachefile", NULL,
+           PROP_DEFAULT, ZFS_TYPE_POOL, "<file> | none", "CACHEFILE");
+       zprop_register_string(ZPOOL_PROP_COMMENT, "comment", NULL,
+           PROP_DEFAULT, ZFS_TYPE_POOL, "<comment-string>", "COMMENT");
 
        /* readonly number properties */
-       register_number(ZPOOL_PROP_SIZE, "size", 0, PROP_READONLY,
+       zprop_register_number(ZPOOL_PROP_SIZE, "size", 0, PROP_READONLY,
            ZFS_TYPE_POOL, "<size>", "SIZE");
-       register_number(ZPOOL_PROP_USED, "used", 0, PROP_READONLY,
-           ZFS_TYPE_POOL, "<size>", "USED");
-       register_number(ZPOOL_PROP_AVAILABLE, "available", 0, PROP_READONLY,
-           ZFS_TYPE_POOL, "<size>", "AVAIL");
-       register_number(ZPOOL_PROP_CAPACITY, "capacity", 0, PROP_READONLY,
+       zprop_register_number(ZPOOL_PROP_FREE, "free", 0, PROP_READONLY,
+           ZFS_TYPE_POOL, "<size>", "FREE");
+       zprop_register_number(ZPOOL_PROP_ALLOCATED, "allocated", 0,
+           PROP_READONLY, ZFS_TYPE_POOL, "<size>", "ALLOC");
+       zprop_register_number(ZPOOL_PROP_EXPANDSZ, "expandsize", 0,
+           PROP_READONLY, ZFS_TYPE_POOL, "<size>", "EXPANDSZ");
+       zprop_register_number(ZPOOL_PROP_CAPACITY, "capacity", 0, PROP_READONLY,
            ZFS_TYPE_POOL, "<size>", "CAP");
-       register_number(ZPOOL_PROP_GUID, "guid", 0, PROP_READONLY,
+       zprop_register_number(ZPOOL_PROP_GUID, "guid", 0, PROP_READONLY,
            ZFS_TYPE_POOL, "<guid>", "GUID");
-       register_number(ZPOOL_PROP_HEALTH, "health", 0, PROP_READONLY,
+       zprop_register_number(ZPOOL_PROP_HEALTH, "health", 0, PROP_READONLY,
            ZFS_TYPE_POOL, "<state>", "HEALTH");
+       zprop_register_number(ZPOOL_PROP_DEDUPRATIO, "dedupratio", 0,
+           PROP_READONLY, ZFS_TYPE_POOL, "<1.00x or higher if deduped>",
+           "DEDUP");
+
+       /* readonly onetime number properties */
+       zprop_register_number(ZPOOL_PROP_ASHIFT, "ashift", 0, PROP_ONETIME,
+           ZFS_TYPE_POOL, "<ashift, 9-13, or 0=default>", "ASHIFT");
 
        /* default number properties */
-       register_number(ZPOOL_PROP_VERSION, "version", SPA_VERSION,
+       zprop_register_number(ZPOOL_PROP_VERSION, "version", SPA_VERSION,
            PROP_DEFAULT, ZFS_TYPE_POOL, "<version>", "VERSION");
+       zprop_register_number(ZPOOL_PROP_DEDUPDITTO, "dedupditto", 0,
+           PROP_DEFAULT, ZFS_TYPE_POOL, "<threshold (min 100)>", "DEDUPDITTO");
 
        /* default index (boolean) properties */
-       register_index(ZPOOL_PROP_DELEGATION, "delegation", 1, PROP_DEFAULT,
-           ZFS_TYPE_POOL, "on | off", "DELEGATION", boolean_table);
-       register_index(ZPOOL_PROP_AUTOREPLACE, "autoreplace", 0, PROP_DEFAULT,
-           ZFS_TYPE_POOL, "on | off", "REPLACE", boolean_table);
-       register_index(ZPOOL_PROP_LISTSNAPS, "listsnapshots", 0, PROP_DEFAULT,
-           ZFS_TYPE_POOL, "on | off", "LISTSNAPS", boolean_table);
-       register_index(ZPOOL_PROP_AUTOEXPAND, "autoexpand", 0, PROP_DEFAULT,
-           ZFS_TYPE_POOL, "on | off", "EXPAND", boolean_table);
+       zprop_register_index(ZPOOL_PROP_DELEGATION, "delegation", 1,
+           PROP_DEFAULT, ZFS_TYPE_POOL, "on | off", "DELEGATION",
+           boolean_table);
+       zprop_register_index(ZPOOL_PROP_AUTOREPLACE, "autoreplace", 0,
+           PROP_DEFAULT, ZFS_TYPE_POOL, "on | off", "REPLACE", boolean_table);
+       zprop_register_index(ZPOOL_PROP_LISTSNAPS, "listsnapshots", 0,
+           PROP_DEFAULT, ZFS_TYPE_POOL, "on | off", "LISTSNAPS",
+           boolean_table);
+       zprop_register_index(ZPOOL_PROP_AUTOEXPAND, "autoexpand", 0,
+           PROP_DEFAULT, ZFS_TYPE_POOL, "on | off", "EXPAND", boolean_table);
+       zprop_register_index(ZPOOL_PROP_READONLY, "readonly", 0,
+           PROP_DEFAULT, ZFS_TYPE_POOL, "on | off", "RDONLY", boolean_table);
 
        /* default index properties */
-       register_index(ZPOOL_PROP_FAILUREMODE, "failmode",
+       zprop_register_index(ZPOOL_PROP_FAILUREMODE, "failmode",
            ZIO_FAILURE_MODE_WAIT, PROP_DEFAULT, ZFS_TYPE_POOL,
            "wait | continue | panic", "FAILMODE", failuremode_table);
 
        /* hidden properties */
-       register_hidden(ZPOOL_PROP_NAME, "name", PROP_TYPE_STRING,
+       zprop_register_hidden(ZPOOL_PROP_NAME, "name", PROP_TYPE_STRING,
            PROP_READONLY, ZFS_TYPE_POOL, "NAME");
 }
 
@@ -166,6 +184,12 @@ zpool_prop_index_to_string(zpool_prop_t prop, uint64_t index,
        return (zprop_index_to_string(prop, index, string, ZFS_TYPE_POOL));
 }
 
+uint64_t
+zpool_prop_random_value(zpool_prop_t prop, uint64_t seed)
+{
+       return (zprop_random_value(prop, seed, ZFS_TYPE_POOL));
+}
+
 #ifndef _KERNEL
 
 const char *
@@ -186,3 +210,19 @@ zpool_prop_align_right(zpool_prop_t prop)
        return (zpool_prop_table[prop].pd_rightalign);
 }
 #endif
+
+#if defined(_KERNEL) && defined(HAVE_SPL)
+/* zpool property functions */
+EXPORT_SYMBOL(zpool_prop_init);
+EXPORT_SYMBOL(zpool_prop_get_type);
+EXPORT_SYMBOL(zpool_prop_get_table);
+
+/* Pool property functions shared between libzfs and kernel. */
+EXPORT_SYMBOL(zpool_name_to_prop);
+EXPORT_SYMBOL(zpool_prop_to_name);
+EXPORT_SYMBOL(zpool_prop_default_string);
+EXPORT_SYMBOL(zpool_prop_default_numeric);
+EXPORT_SYMBOL(zpool_prop_readonly);
+EXPORT_SYMBOL(zpool_prop_index_to_string);
+EXPORT_SYMBOL(zpool_prop_string_to_index);
+#endif