summaryrefslogtreecommitdiff
path: root/usr/src/lib/libzfs/common/libzfs_util.c
diff options
context:
space:
mode:
authorahrens <none@none>2007-08-02 21:23:46 -0700
committerahrens <none@none>2007-08-02 21:23:46 -0700
commit91ebeef555ce7f899b6270a3c2df47b51f7ad59a (patch)
tree7c2ea33b8ecbb85fdd82366244cb0850dbba3287 /usr/src/lib/libzfs/common/libzfs_util.c
parent03509b53a806cb39ca94c9a1c00f1c6405321554 (diff)
downloadillumos-joyent-91ebeef555ce7f899b6270a3c2df47b51f7ad59a.tar.gz
6393351 unique_* could be improved
6553348 assertion failed: ab->b_flags & (1 << 3) at line 2572 of arc.c 6582408 ::arc should accept -k/-m/-g to print in kilo/mega/giga-bytes 6582438 should have generic reader-priority rwlock for spa_config locks 6582441 zfs_cmd_t should only be used to pass arguments to/from userland 6582456 property code is overdue for some spring cleaning 6588564 zpl unmount lock should use regular rwlock
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_util.c')
-rw-r--r--usr/src/lib/libzfs/common/libzfs_util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_util.c b/usr/src/lib/libzfs/common/libzfs_util.c
index 26c4422b82..7c45ef727e 100644
--- a/usr/src/lib/libzfs/common/libzfs_util.c
+++ b/usr/src/lib/libzfs/common/libzfs_util.c
@@ -44,6 +44,7 @@
#include <libzfs.h>
#include "libzfs_impl.h"
+#include "zfs_prop.h"
int
libzfs_errno(libzfs_handle_t *hdl)
@@ -186,9 +187,6 @@ libzfs_error_description(libzfs_handle_t *hdl)
return (dgettext(TEXT_DOMAIN, "invalid permission"));
case EZFS_BADPERMSET:
return (dgettext(TEXT_DOMAIN, "invalid permission set name"));
- case EZFS_PERMSET_CIRCULAR:
- return (dgettext(TEXT_DOMAIN,
- "Cannot define a permission set in terms of itself"));
case EZFS_NODELEGATION:
return (dgettext(TEXT_DOMAIN, "delegated administration is "
"disabled on pool"));
@@ -556,6 +554,8 @@ libzfs_init(void)
hdl->libzfs_sharetab = fopen("/etc/dfs/sharetab", "r");
+ zfs_prop_init();
+
return (hdl);
}