From 1c27024e22af4386b592b30d40e6a0820ceb48c1 Mon Sep 17 00:00:00 2001 From: Don Brady Date: Sat, 4 Nov 2017 14:25:13 -0600 Subject: Undo c89 workarounds to match with upstream With PR 5756 the zfs module now supports c99 and the remaining past c89 workarounds can be undone. Reviewed-by: Brian Behlendorf Reviewed-by: George Melikov Signed-off-by: Don Brady Closes #6816 --- module/zfs/spa_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/zfs/spa_config.c') diff --git a/module/zfs/spa_config.c b/module/zfs/spa_config.c index 0ee46c2f2..ec9661b86 100644 --- a/module/zfs/spa_config.c +++ b/module/zfs/spa_config.c @@ -413,7 +413,6 @@ spa_config_generate(spa_t *spa, vdev_t *vd, uint64_t txg, int getstats) boolean_t locked = B_FALSE; uint64_t split_guid; char *pool_name; - int config_gen_flags = 0; if (vd == NULL) { vd = rvd; @@ -463,6 +462,7 @@ spa_config_generate(spa_t *spa, vdev_t *vd, uint64_t txg, int getstats) fnvlist_add_uint64(config, ZPOOL_CONFIG_HOSTID, hostid); fnvlist_add_string(config, ZPOOL_CONFIG_HOSTNAME, utsname()->nodename); + int config_gen_flags = 0; if (vd != rvd) { fnvlist_add_uint64(config, ZPOOL_CONFIG_TOP_GUID, vd->vdev_top->vdev_guid); -- cgit v1.2.3