summaryrefslogtreecommitdiff
path: root/usr/src/lib/libzfs/common/libzfs_util.c
diff options
context:
space:
mode:
authorMatthew Ahrens <Matthew.Ahrens@Sun.COM>2009-04-18 13:41:47 -0700
committerMatthew Ahrens <Matthew.Ahrens@Sun.COM>2009-04-18 13:41:47 -0700
commit148434217c040ea38dc844384f6ba68d9b325906 (patch)
treeed04bcf57eac8c6bd1eacab471a79499bac86504 /usr/src/lib/libzfs/common/libzfs_util.c
parenteead73cfdc384282a25862c27aed73c597fc10a9 (diff)
downloadillumos-joyent-148434217c040ea38dc844384f6ba68d9b325906.tar.gz
PSARC/2009/204 ZFS user/group quotas & space accounting
6501037 want user/group quotas on ZFS 6830813 zfs list -t all fails assertion 6827260 assertion failed in arc_read(): hdr == pbuf->b_hdr 6815592 panic: No such hold X on refcount Y from zfs_znode_move 6759986 zfs list shows temporary %clone when doing online zfs recv
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_util.c')
-rw-r--r--usr/src/lib/libzfs/common/libzfs_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_util.c b/usr/src/lib/libzfs/common/libzfs_util.c
index 17d8db5c75..e1993ce0f2 100644
--- a/usr/src/lib/libzfs/common/libzfs_util.c
+++ b/usr/src/lib/libzfs/common/libzfs_util.c
@@ -1221,7 +1221,7 @@ addlist(libzfs_handle_t *hdl, char *propname, zprop_list_t **listp,
* dataset property,
*/
if (prop == ZPROP_INVAL && (type == ZFS_TYPE_POOL ||
- !zfs_prop_user(propname))) {
+ (!zfs_prop_user(propname) && !zfs_prop_userquota(propname)))) {
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"invalid property '%s'"), propname);
return (zfs_error(hdl, EZFS_BADPROP,