c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-04-06 17:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix "zpool get guid,freeing,leaked" source

Browse Source 
`zpool get guid,freeing,leaked` shows SOURCE as `default`, it should
be `-` as those props are not editable.

Changed code to not overwrite `src` for `ZPOOL_PROP_VERSION`, so it
stays `ZPROP_SRC_NONE`.  Make src const to avoid future mistakes

Signed-off-by: Hajo Möller <dasjoe@gmail.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4170
This commit is contained in:
Hajo Möller 2016-01-05 22:46:54 +01:00 committed by Brian Behlendorf
parent 8fe453b671
commit 82ab6848cc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
module/zfs/spa.c
View File

@ -200,7 +200,7 @@ spa_prop_get_config(spa_t *spa, nvlist_t **nvp)
vdev_t *rvd = spa->spa_root_vdev; vdev_t *rvd = spa->spa_root_vdev;
dsl_pool_t *pool = spa->spa_dsl_pool; dsl_pool_t *pool = spa->spa_dsl_pool;
uint64_t size, alloc, cap, version; uint64_t size, alloc, cap, version;
zprop_source_t src = ZPROP_SRC_NONE; const zprop_source_t src = ZPROP_SRC_NONE;
spa_config_dirent_t *dp; spa_config_dirent_t *dp;
metaslab_class_t *mc = spa_normal_class(spa); metaslab_class_t *mc = spa_normal_class(spa);
@ -232,11 +232,13 @@ spa_prop_get_config(spa_t *spa, nvlist_t **nvp)
rvd->vdev_state, src); rvd->vdev_state, src);
version = spa_version(spa); version = spa_version(spa);
if (version == zpool_prop_default_numeric(ZPOOL_PROP_VERSION)) if (version == zpool_prop_default_numeric(ZPOOL_PROP_VERSION)) {
src = ZPROP_SRC_DEFAULT; spa_prop_add_list(*nvp, ZPOOL_PROP_VERSION, NULL,
else version, ZPROP_SRC_DEFAULT);
src = ZPROP_SRC_LOCAL; } else {
spa_prop_add_list(*nvp, ZPOOL_PROP_VERSION, NULL, version, src); spa_prop_add_list(*nvp, ZPOOL_PROP_VERSION, NULL,
version, ZPROP_SRC_LOCAL);
}
} }
if (pool != NULL) { if (pool != NULL) {