Fix typo/etc in module/zfs/zfs_ctldir.c

[mirror_zfs.git] / module / zfs / dsl_deleg.c

diff --git a/module/zfs/dsl_deleg.c b/module/zfs/dsl_deleg.c
index 23bbe5b946928fec9d69babdf74ac817a9fd9e0e..cef460f020416d96393a8d5c6982eaa9456c42e2 100644 (file)
--- a/module/zfs/dsl_deleg.c
+++ b/module/zfs/dsl_deleg.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
  */
 
 /*
@@ -282,7 +282,7 @@ dsl_deleg_set(const char *ddname, nvlist_t *nvp, boolean_t unset)
 
        return (dsl_sync_task(ddname, dsl_deleg_check,
            unset ? dsl_deleg_unset_sync : dsl_deleg_set_sync,
-           &dda, fnvlist_num_pairs(nvp)));
+           &dda, fnvlist_num_pairs(nvp), ZFS_SPACE_CHECK_RESERVED));
 }
 
 /*
@@ -330,7 +330,7 @@ dsl_deleg_get(const char *ddname, nvlist_t **nvp)
        za = kmem_alloc(sizeof (zap_attribute_t), KM_SLEEP);
        basezc = kmem_alloc(sizeof (zap_cursor_t), KM_SLEEP);
        baseza = kmem_alloc(sizeof (zap_attribute_t), KM_SLEEP);
-       source = kmem_alloc(MAXNAMELEN + strlen(MOS_DIR_NAME) + 1, KM_SLEEP);
+       source = kmem_alloc(ZFS_MAX_DATASET_NAME_LEN, KM_SLEEP);
        VERIFY(nvlist_alloc(nvp, NV_UNIQUE_NAME, KM_SLEEP) == 0);
 
        for (dd = startdd; dd != NULL; dd = dd->dd_parent) {
@@ -370,7 +370,7 @@ dsl_deleg_get(const char *ddname, nvlist_t **nvp)
                nvlist_free(sp_nvp);
        }
 
-       kmem_free(source, MAXNAMELEN + strlen(MOS_DIR_NAME) + 1);
+       kmem_free(source, ZFS_MAX_DATASET_NAME_LEN);
        kmem_free(baseza, sizeof (zap_attribute_t));
        kmem_free(basezc, sizeof (zap_cursor_t));
        kmem_free(za, sizeof (zap_attribute_t));
@@ -393,14 +393,13 @@ typedef struct perm_set {
 static int
 perm_set_compare(const void *arg1, const void *arg2)
 {
-       const perm_set_t *node1 = arg1;
-       const perm_set_t *node2 = arg2;
+       const perm_set_t *node1 = (const perm_set_t *)arg1;
+       const perm_set_t *node2 = (const perm_set_t *)arg2;
        int val;
 
        val = strcmp(node1->p_setname, node2->p_setname);
-       if (val == 0)
-               return (0);
-       return (val > 0 ? 1 : -1);
+
+       return (AVL_ISIGN(val));
 }
 
 /*
@@ -769,7 +768,7 @@ dsl_delegation_on(objset_t *os)
        return (!!spa_delegation(os->os_spa));
 }
 
-#if defined(_KERNEL) && defined(HAVE_SPL)
+#if defined(_KERNEL)
 EXPORT_SYMBOL(dsl_deleg_get);
 EXPORT_SYMBOL(dsl_deleg_set);
 #endif