]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Fix "zpool get guid,freeing,leaked" source
authorHajo Möller <dasjoe@gmail.com>
Tue, 5 Jan 2016 21:46:54 +0000 (22:46 +0100)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 30 Aug 2016 22:57:15 +0000 (15:57 -0700)
`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

module/zfs/spa.c

index 3b63427c2c96579f098dcbbc6253aa3575c1e94d..374322a037f553c2cdd05c44d15b608c069dbef9 100644 (file)
@@ -200,7 +200,7 @@ spa_prop_get_config(spa_t *spa, nvlist_t **nvp)
        vdev_t *rvd = spa->spa_root_vdev;
        dsl_pool_t *pool = spa->spa_dsl_pool;
        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;
        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);
 
                version = spa_version(spa);
-               if (version == zpool_prop_default_numeric(ZPOOL_PROP_VERSION))
-                       src = ZPROP_SRC_DEFAULT;
-               else
-                       src = ZPROP_SRC_LOCAL;
-               spa_prop_add_list(*nvp, ZPOOL_PROP_VERSION, NULL, version, src);
+               if (version == zpool_prop_default_numeric(ZPOOL_PROP_VERSION)) {
+                       spa_prop_add_list(*nvp, ZPOOL_PROP_VERSION, NULL,
+                           version, ZPROP_SRC_DEFAULT);
+               } else {
+                       spa_prop_add_list(*nvp, ZPOOL_PROP_VERSION, NULL,
+                           version, ZPROP_SRC_LOCAL);
+               }
        }
 
        if (pool != NULL) {