diff options
| author | Josef 'Jeff' Sipek <[email protected]> | 2016-03-31 23:54:07 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-04-27 15:58:23 -0700 |
| commit | 8a5fc74880251aa651306d1dbcc60715698996f0 (patch) | |
| tree | fd37b86a51274e2e6c3942d1adca2d088127c9ea /lib/libzfs/libzfs_config.c | |
| parent | 16794374b37fb22c32616fe1f40ade1304628ff9 (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 'lib/libzfs/libzfs_config.c')
| -rw-r--r-- | lib/libzfs/libzfs_config.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libzfs/libzfs_config.c b/lib/libzfs/libzfs_config.c index 849a13051..6ecfe98ff 100644 --- a/lib/libzfs/libzfs_config.c +++ b/lib/libzfs/libzfs_config.c @@ -311,8 +311,7 @@ zpool_refresh_stats(zpool_handle_t *zhp, boolean_t *missing) zhp->zpool_config_size = zc.zc_nvlist_dst_size; if (zhp->zpool_config != NULL) { - if (zhp->zpool_old_config != NULL) - nvlist_free(zhp->zpool_old_config); + nvlist_free(zhp->zpool_old_config); zhp->zpool_old_config = zhp->zpool_config; } |