svn commit: r296527 - vendor-sys/illumos/dist/common/nvpair vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/cmd/zfs vendor/illumos/dist/cmd/zpool vendor/illumos/dist/lib/libzfs/common
Alexander Motin
mav at FreeBSD.org
Tue Mar 8 18:08:35 UTC 2016
Author: mav
Date: Tue Mar 8 18:08:33 2016
New Revision: 296527
URL: https://svnweb.freebsd.org/changeset/base/296527
Log:
6659 nvlist_free(NULL) is a no-op
Reviewed by: Toomas Soome <tsoome at me.com>
Reviewed by: Marcel Telka <marcel at telka.sk>
Approved by: Robert Mustacchi <rm at joyent.com>
Author: Josef 'Jeff' Sipek <jeffpc at josefsipek.net>
illumos/illumos-gate at aab83bb83be7342f6cfccaed8d5fe0b2f404855d
Modified:
vendor-sys/illumos/dist/common/nvpair/nvpair.c
vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
vendor-sys/illumos/dist/uts/common/fs/zfs/spa_config.c
vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c
Changes in other areas also in this revision:
Modified:
vendor/illumos/dist/cmd/zfs/zfs_main.c
vendor/illumos/dist/cmd/zpool/zpool_main.c
vendor/illumos/dist/cmd/zpool/zpool_vdev.c
vendor/illumos/dist/lib/libzfs/common/libzfs_config.c
vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c
vendor/illumos/dist/lib/libzfs/common/libzfs_import.c
vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c
vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c
Modified: vendor-sys/illumos/dist/common/nvpair/nvpair.c
==============================================================================
--- vendor-sys/illumos/dist/common/nvpair/nvpair.c Tue Mar 8 18:05:23 2016 (r296526)
+++ vendor-sys/illumos/dist/common/nvpair/nvpair.c Tue Mar 8 18:08:33 2016 (r296527)
@@ -540,8 +540,7 @@ nvpair_free(nvpair_t *nvp)
int i;
for (i = 0; i < NVP_NELEM(nvp); i++)
- if (nvlp[i] != NULL)
- nvlist_free(nvlp[i]);
+ nvlist_free(nvlp[i]);
break;
}
default:
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Tue Mar 8 18:05:23 2016 (r296526)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Tue Mar 8 18:08:33 2016 (r296527)
@@ -6006,8 +6006,7 @@ spa_sync_config_object(spa_t *spa, dmu_t
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);
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa_config.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa_config.c Tue Mar 8 18:05:23 2016 (r296526)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa_config.c Tue Mar 8 18:08:33 2016 (r296527)
@@ -344,8 +344,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);
}
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c Tue Mar 8 18:05:23 2016 (r296526)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_ioctl.c Tue Mar 8 18:08:33 2016 (r296527)
@@ -1558,8 +1558,7 @@ zfs_ioc_pool_import(zfs_cmd_t *zc)
nvlist_free(config);
- if (props)
- nvlist_free(props);
+ nvlist_free(props);
return (error);
}
More information about the svn-src-vendor
mailing list