diff options
| author | mav <mav@FreeBSD.org> | 2016-03-21 00:22:09 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2016-03-21 00:22:09 +0000 |
| commit | 18f23d78714536c48ef5b0c0792d423102325ee4 (patch) | |
| tree | 5ecfd5f7e1b82c915384303cd8e5bfad5f721c04 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | |
| parent | e34c027e2e21bb8122b138bc26bcc6099ef0f26a (diff) | |
| download | FreeBSD-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.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c index c7cf995..563967d 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c @@ -6348,8 +6348,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); |
