Cast 'zfs bad bloc' to ULL for x86

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

diff --git a/module/zcommon/zprop_common.c b/module/zcommon/zprop_common.c
index 0bbf20d..0a0af23 100644 (file)
--- a/module/zcommon/zprop_common.c
+++ b/module/zcommon/zprop_common.c
@@ -162,7 +162,7 @@ int
 zprop_iter_common(zprop_func func, void *cb, boolean_t show_all,
     boolean_t ordered, zfs_type_t type)
 {
-       int i, num_props, size, prop;
+       int i, j, num_props, size, prop;
        zprop_desc_t *prop_tbl;
        zprop_desc_t **order;
 
@@ -171,13 +171,13 @@ zprop_iter_common(zprop_func func, void *cb, boolean_t show_all,
        size = num_props * sizeof (zprop_desc_t *);
 
 #if defined(_KERNEL)
-       order = kmem_alloc(size, KM_SLEEP);
+       order = kmem_alloc(size, KM_PUSHPAGE);
 #else
        if ((order = malloc(size)) == NULL)
                return (ZPROP_CONT);
 #endif
 
-       for (int j = 0; j < num_props; j++)
+       for (j = 0; j < num_props; j++)
                order[j] = &prop_tbl[j];
 
        if (ordered) {
@@ -424,3 +424,21 @@ zprop_width(int prop, boolean_t *fixed, zfs_type_t type)
 }
 
 #endif
+
+#if defined(_KERNEL) && defined(HAVE_SPL)
+/* Common routines to initialize property tables */
+EXPORT_SYMBOL(zprop_register_impl);
+EXPORT_SYMBOL(zprop_register_string);
+EXPORT_SYMBOL(zprop_register_number);
+EXPORT_SYMBOL(zprop_register_index);
+EXPORT_SYMBOL(zprop_register_hidden);
+
+/* Common routines for zfs and zpool property management */
+EXPORT_SYMBOL(zprop_iter_common);
+EXPORT_SYMBOL(zprop_name_to_prop);
+EXPORT_SYMBOL(zprop_string_to_index);
+EXPORT_SYMBOL(zprop_index_to_string);
+EXPORT_SYMBOL(zprop_random_value);
+EXPORT_SYMBOL(zprop_values);
+EXPORT_SYMBOL(zprop_valid_for_type);
+#endif