diff options
| author | ck153898 <none@none> | 2007-10-29 22:45:33 -0700 |
|---|---|---|
| committer | ck153898 <none@none> | 2007-10-29 22:45:33 -0700 |
| commit | a9799022bd90b13722204e80112efaa5bf573099 (patch) | |
| tree | 59256985fdeae5fe80d2e610e28f3bf9ac0b42a8 /usr/src/lib/libzfs/common/libzfs_util.c | |
| parent | db97dd7c1f6464efdbafd832c3e6b3b13919e3e3 (diff) | |
| download | illumos-joyent-a9799022bd90b13722204e80112efaa5bf573099.tar.gz | |
PSARC 2007/555 zfs fs-only quotas and reservations
6431277 want filesystem-only quotas
6483677 need immediate reservation
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_util.c')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_util.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_util.c b/usr/src/lib/libzfs/common/libzfs_util.c index 6e16aa3be1..d2005867e3 100644 --- a/usr/src/lib/libzfs/common/libzfs_util.c +++ b/usr/src/lib/libzfs/common/libzfs_util.c @@ -1065,7 +1065,6 @@ zprop_parse_value(libzfs_handle_t *hdl, nvpair_t *elem, int prop, const char *propname; char *value; boolean_t isnone = B_FALSE; - boolean_t boolval; if (type == ZFS_TYPE_POOL) { proptype = zpool_prop_get_type(prop); @@ -1116,34 +1115,23 @@ zprop_parse_value(libzfs_handle_t *hdl, nvpair_t *elem, int prop, /* * Quota special: force 'none' and don't allow 0. */ - if ((type & ZFS_TYPE_DATASET) && *ivalp == 0 && - !isnone && prop == ZFS_PROP_QUOTA) { + if ((type & ZFS_TYPE_DATASET) && *ivalp == 0 && !isnone && + (prop == ZFS_PROP_QUOTA || prop == ZFS_PROP_REFQUOTA)) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, - "use 'none' to disable quota")); + "use 'none' to disable quota/refquota")); goto error; } break; case PROP_TYPE_INDEX: - switch (datatype) { - case DATA_TYPE_STRING: - (void) nvpair_value_string(elem, &value); - break; - - case DATA_TYPE_BOOLEAN_VALUE: - (void) nvpair_value_boolean_value(elem, &boolval); - if (boolval) - value = "on"; - else - value = "off"; - break; - - default: + if (datatype != DATA_TYPE_STRING) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "'%s' must be a string"), nvpair_name(elem)); goto error; } + (void) nvpair_value_string(elem, &value); + if (zprop_string_to_index(prop, value, ivalp, type) != 0) { zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "'%s' must be one of '%s'"), propname, |