Update nvpair's to include nv_alloc_fixed support

[zfs.git] / module / zfs / dsl_dir.c

diff --git a/module/zfs/dsl_dir.c b/module/zfs/dsl_dir.c
index e5e18f4..2f312ae 100644 (file)
--- a/module/zfs/dsl_dir.c
+++ b/module/zfs/dsl_dir.c
@@ -96,7 +96,6 @@ dsl_dir_open_obj(dsl_pool_t *dp, uint64_t ddobj,
 #endif
        if (dd == NULL) {
                dsl_dir_t *winner;
-               int err;
 
                dd = kmem_zalloc(sizeof (dsl_dir_t), KM_SLEEP);
                dd->dd_object = ddobj;
@@ -227,24 +226,11 @@ dsl_dir_namelen(dsl_dir_t *dd)
        return (result);
 }
 
-int
-dsl_dir_is_private(dsl_dir_t *dd)
-{
-       int rv = FALSE;
-
-       if (dd->dd_parent && dsl_dir_is_private(dd->dd_parent))
-               rv = TRUE;
-       if (dataset_name_hidden(dd->dd_myname))
-               rv = TRUE;
-       return (rv);
-}
-
-
 static int
 getcomponent(const char *path, char *component, const char **nextp)
 {
        char *p;
-       if (path == NULL)
+       if ((path == NULL) || (path[0] == '\0'))
                return (ENOENT);
        /* This would be a good place to reserve some namespace... */
        p = strpbrk(path, "/@");