summaryrefslogtreecommitdiffstats
path: root/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2016-03-21 00:22:09 +0000
committermav <mav@FreeBSD.org>2016-03-21 00:22:09 +0000
commit18f23d78714536c48ef5b0c0792d423102325ee4 (patch)
tree5ecfd5f7e1b82c915384303cd8e5bfad5f721c04 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
parente34c027e2e21bb8122b138bc26bcc6099ef0f26a (diff)
downloadFreeBSD-src-18f23d78714536c48ef5b0c0792d423102325ee4.zip
FreeBSD-src-18f23d78714536c48ef5b0c0792d423102325ee4.tar.gz
MFC r296528: MFV r296527: 6659 nvlist_free(NULL) is a no-op
Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Marcel Telka <marcel@telka.sk> Approved by: Robert Mustacchi <rm@joyent.com> Author: Josef 'Jeff' Sipek <jeffpc@josefsipek.net> illumos/illumos-gate@aab83bb83be7342f6cfccaed8d5fe0b2f404855d
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
index be1e528..a5c17a5 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
@@ -367,8 +367,7 @@ void
spa_config_set(spa_t *spa, nvlist_t *config)
{
mutex_enter(&spa->spa_props_lock);
- if (spa->spa_config != NULL)
- nvlist_free(spa->spa_config);
+ nvlist_free(spa->spa_config);
spa->spa_config = config;
mutex_exit(&spa->spa_props_lock);
}
OpenPOWER on IntegriCloud