aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs/spa.c
diff options
context:
space:
mode:
authorJosef 'Jeff' Sipek <[email protected]>2016-03-31 23:54:07 -0400
committerBrian Behlendorf <[email protected]>2016-04-27 15:58:23 -0700
commit8a5fc74880251aa651306d1dbcc60715698996f0 (patch)
treefd37b86a51274e2e6c3942d1adca2d088127c9ea /module/zfs/spa.c
parent16794374b37fb22c32616fe1f40ade1304628ff9 (diff)
Illumos 6659 - nvlist_free(NULL) is a no-op
6659 nvlist_free(NULL) is a no-op Reviewed by: Toomas Soome <[email protected]> Reviewed by: Marcel Telka <[email protected]> Approved by: Robert Mustacchi <[email protected]> References: https://www.illumos.org/issues/6659 https://github.com/illumos/illumos-gate/commit/aab83bb Ported-by: David Quigley <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #4566
Diffstat (limited to 'module/zfs/spa.c')
-rw-r--r--module/zfs/spa.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index 01048bfe9..63425d3d0 100644
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -6132,8 +6132,7 @@ spa_sync_config_object(spa_t *spa, dmu_tx_t *tx)
spa_config_exit(spa, SCL_STATE, FTAG);
- if (spa->spa_config_syncing)
- nvlist_free(spa->spa_config_syncing);
+ nvlist_free(spa->spa_config_syncing);
spa->spa_config_syncing = config;
spa_sync_nvlist(spa, spa->spa_config_object, config, tx);