Cast 'zfs bad bloc' to ULL for x86

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

diff --git a/module/zcommon/zpool_prop.c b/module/zcommon/zpool_prop.c
index 6c69fca..1173fc0 100644 (file)
--- a/module/zcommon/zpool_prop.c
+++ b/module/zcommon/zpool_prop.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
 #include <sys/zio.h>
@@ -79,8 +79,12 @@ zpool_prop_init(void)
            ZFS_TYPE_POOL, "<size>", "SIZE");
        zprop_register_number(ZPOOL_PROP_FREE, "free", 0, PROP_READONLY,
            ZFS_TYPE_POOL, "<size>", "FREE");
+       zprop_register_number(ZPOOL_PROP_FREEING, "freeing", 0, PROP_READONLY,
+           ZFS_TYPE_POOL, "<size>", "FREEING");
        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");
        zprop_register_number(ZPOOL_PROP_GUID, "guid", 0, PROP_READONLY,
@@ -168,6 +172,26 @@ zpool_prop_default_numeric(zpool_prop_t prop)
        return (zpool_prop_table[prop].pd_numdefault);
 }
 
+/*
+ * Returns true if this is a valid feature@ property.
+ */
+boolean_t
+zpool_prop_feature(const char *name)
+{
+       static const char *prefix = "feature@";
+       return (strncmp(name, prefix, strlen(prefix)) == 0);
+}
+
+/*
+ * Returns true if this is a valid unsupported@ property.
+ */
+boolean_t
+zpool_prop_unsupported(const char *name)
+{
+       static const char *prefix = "unsupported@";
+       return (strncmp(name, prefix, strlen(prefix)) == 0);
+}
+
 int
 zpool_prop_string_to_index(zpool_prop_t prop, const char *string,
     uint64_t *index)
@@ -221,6 +245,8 @@ 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_feature);
+EXPORT_SYMBOL(zpool_prop_unsupported);
 EXPORT_SYMBOL(zpool_prop_index_to_string);
 EXPORT_SYMBOL(zpool_prop_string_to_index);
 #endif