Deleted Added
full compact
libzfs_dataset.c (330590) libzfs_dataset.c (331391)
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 2147 unchanged lines hidden (view full) ---

2156 default:
2157 switch (zfs_prop_get_type(prop)) {
2158 case PROP_TYPE_NUMBER:
2159 case PROP_TYPE_INDEX:
2160 *val = getprop_uint64(zhp, prop, source);
2161 /*
2162 * If we tried to use a default value for a
2163 * readonly property, it means that it was not
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 2147 unchanged lines hidden (view full) ---

2156 default:
2157 switch (zfs_prop_get_type(prop)) {
2158 case PROP_TYPE_NUMBER:
2159 case PROP_TYPE_INDEX:
2160 *val = getprop_uint64(zhp, prop, source);
2161 /*
2162 * If we tried to use a default value for a
2163 * readonly property, it means that it was not
2164 * present.
2164 * present. Note this only applies to "truly"
2165 * readonly properties, not set-once properties
2166 * like volblocksize.
2165 */
2166 if (zfs_prop_readonly(prop) &&
2167 */
2168 if (zfs_prop_readonly(prop) &&
2169 !zfs_prop_setonce(prop) &&
2167 *source != NULL && (*source)[0] == '\0') {
2168 *source = NULL;
2169 return (-1);
2170 }
2171 break;
2172
2173 case PROP_TYPE_STRING:
2174 default:

--- 2918 unchanged lines hidden ---
2170 *source != NULL && (*source)[0] == '\0') {
2171 *source = NULL;
2172 return (-1);
2173 }
2174 break;
2175
2176 case PROP_TYPE_STRING:
2177 default:

--- 2918 unchanged lines hidden ---