Deleted Added
full compact
spa.c (268649) spa.c (268650)
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

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

253 if (version == zpool_prop_default_numeric(ZPOOL_PROP_VERSION))
254 src = ZPROP_SRC_DEFAULT;
255 else
256 src = ZPROP_SRC_LOCAL;
257 spa_prop_add_list(*nvp, ZPOOL_PROP_VERSION, NULL, version, src);
258 }
259
260 if (pool != NULL) {
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

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

253 if (version == zpool_prop_default_numeric(ZPOOL_PROP_VERSION))
254 src = ZPROP_SRC_DEFAULT;
255 else
256 src = ZPROP_SRC_LOCAL;
257 spa_prop_add_list(*nvp, ZPOOL_PROP_VERSION, NULL, version, src);
258 }
259
260 if (pool != NULL) {
261 dsl_dir_t *freedir = pool->dp_free_dir;
262
263 /*
264 * The $FREE directory was introduced in SPA_VERSION_DEADLISTS,
265 * when opening pools before this version freedir will be NULL.
266 */
261 /*
262 * The $FREE directory was introduced in SPA_VERSION_DEADLISTS,
263 * when opening pools before this version freedir will be NULL.
264 */
267 if (freedir != NULL) {
265 if (pool->dp_free_dir != NULL) {
268 spa_prop_add_list(*nvp, ZPOOL_PROP_FREEING, NULL,
266 spa_prop_add_list(*nvp, ZPOOL_PROP_FREEING, NULL,
269 freedir->dd_phys->dd_used_bytes, src);
267 pool->dp_free_dir->dd_phys->dd_used_bytes, src);
270 } else {
271 spa_prop_add_list(*nvp, ZPOOL_PROP_FREEING,
272 NULL, 0, src);
273 }
268 } else {
269 spa_prop_add_list(*nvp, ZPOOL_PROP_FREEING,
270 NULL, 0, src);
271 }
272
273 if (pool->dp_leak_dir != NULL) {
274 spa_prop_add_list(*nvp, ZPOOL_PROP_LEAKED, NULL,
275 pool->dp_leak_dir->dd_phys->dd_used_bytes, src);
276 } else {
277 spa_prop_add_list(*nvp, ZPOOL_PROP_LEAKED,
278 NULL, 0, src);
279 }
274 }
275
276 spa_prop_add_list(*nvp, ZPOOL_PROP_GUID, NULL, spa_guid(spa), src);
277
278 if (spa->spa_comment != NULL) {
279 spa_prop_add_list(*nvp, ZPOOL_PROP_COMMENT, spa->spa_comment,
280 0, ZPROP_SRC_LOCAL);
281 }

--- 6598 unchanged lines hidden ---
280 }
281
282 spa_prop_add_list(*nvp, ZPOOL_PROP_GUID, NULL, spa_guid(spa), src);
283
284 if (spa->spa_comment != NULL) {
285 spa_prop_add_list(*nvp, ZPOOL_PROP_COMMENT, spa->spa_comment,
286 0, ZPROP_SRC_LOCAL);
287 }

--- 6598 unchanged lines hidden ---