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:36 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/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
Changes in other areas also in this revision:
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
Modified: vendor/illumos/dist/cmd/zfs/zfs_main.c
==============================================================================
--- vendor/illumos/dist/cmd/zfs/zfs_main.c Tue Mar 8 18:05:23 2016 (r296526)
+++ vendor/illumos/dist/cmd/zfs/zfs_main.c Tue Mar 8 18:08:33 2016 (r296527)
@@ -5327,8 +5327,7 @@ zfs_do_allow_unallow_impl(int argc, char
cleanup0:
nvlist_free(perm_nvl);
- if (update_perm_nvl != NULL)
- nvlist_free(update_perm_nvl);
+ nvlist_free(update_perm_nvl);
cleanup1:
fs_perm_set_fini(&fs_perm_set);
cleanup2:
Modified: vendor/illumos/dist/cmd/zpool/zpool_main.c
==============================================================================
--- vendor/illumos/dist/cmd/zpool/zpool_main.c Tue Mar 8 18:05:23 2016 (r296526)
+++ vendor/illumos/dist/cmd/zpool/zpool_main.c Tue Mar 8 18:08:33 2016 (r296527)
@@ -3267,8 +3267,7 @@ zpool_do_split(int argc, char **argv)
if (add_prop_list(
zpool_prop_to_name(ZPOOL_PROP_ALTROOT), optarg,
&props, B_TRUE) != 0) {
- if (props)
- nvlist_free(props);
+ nvlist_free(props);
usage(B_FALSE);
}
break;
@@ -3281,8 +3280,7 @@ zpool_do_split(int argc, char **argv)
propval++;
if (add_prop_list(optarg, propval,
&props, B_TRUE) != 0) {
- if (props)
- nvlist_free(props);
+ nvlist_free(props);
usage(B_FALSE);
}
} else {
Modified: vendor/illumos/dist/cmd/zpool/zpool_vdev.c
==============================================================================
--- vendor/illumos/dist/cmd/zpool/zpool_vdev.c Tue Mar 8 18:05:23 2016 (r296526)
+++ vendor/illumos/dist/cmd/zpool/zpool_vdev.c Tue Mar 8 18:08:33 2016 (r296527)
@@ -1400,8 +1400,7 @@ split_mirror_vdev(zpool_handle_t *zhp, c
}
if (zpool_vdev_split(zhp, newname, &newroot, props, flags) != 0) {
- if (newroot != NULL)
- nvlist_free(newroot);
+ nvlist_free(newroot);
return (NULL);
}
Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_config.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_config.c Tue Mar 8 18:05:23 2016 (r296526)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_config.c Tue Mar 8 18:08:33 2016 (r296527)
@@ -318,8 +318,7 @@ zpool_refresh_stats(zpool_handle_t *zhp,
verify(nvlist_lookup_uint64(config,
ZPOOL_CONFIG_POOL_TXG, &newtxg) == 0);
- if (zhp->zpool_old_config != NULL)
- nvlist_free(zhp->zpool_old_config);
+ nvlist_free(zhp->zpool_old_config);
if (oldtxg != newtxg) {
nvlist_free(zhp->zpool_config);
Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c Tue Mar 8 18:05:23 2016 (r296526)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_dataset.c Tue Mar 8 18:08:33 2016 (r296527)
@@ -2004,8 +2004,7 @@ get_numeric_property(zfs_handle_t *zhp,
zcmd_free_nvlists(&zc);
return (-1);
}
- if (zplprops)
- nvlist_free(zplprops);
+ nvlist_free(zplprops);
zcmd_free_nvlists(&zc);
break;
@@ -4236,8 +4235,7 @@ zfs_smb_acl_mgmt(libzfs_handle_t *hdl, c
return (-1);
}
error = ioctl(hdl->libzfs_fd, ZFS_IOC_SMB_ACL, &zc);
- if (nvlist)
- nvlist_free(nvlist);
+ nvlist_free(nvlist);
return (error);
}
Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_import.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_import.c Tue Mar 8 18:05:23 2016 (r296526)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_import.c Tue Mar 8 18:08:33 2016 (r296527)
@@ -1282,8 +1282,7 @@ error:
venext = ve->ve_next;
for (ce = ve->ve_configs; ce != NULL; ce = cenext) {
cenext = ce->ce_next;
- if (ce->ce_config)
- nvlist_free(ce->ce_config);
+ nvlist_free(ce->ce_config);
free(ce);
}
free(ve);
Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c Tue Mar 8 18:05:23 2016 (r296526)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_pool.c Tue Mar 8 18:08:33 2016 (r296527)
@@ -1025,12 +1025,9 @@ zpool_open(libzfs_handle_t *hdl, const c
void
zpool_close(zpool_handle_t *zhp)
{
- if (zhp->zpool_config)
- nvlist_free(zhp->zpool_config);
- if (zhp->zpool_old_config)
- nvlist_free(zhp->zpool_old_config);
- if (zhp->zpool_props)
- nvlist_free(zhp->zpool_props);
+ nvlist_free(zhp->zpool_config);
+ nvlist_free(zhp->zpool_old_config);
+ nvlist_free(zhp->zpool_props);
free(zhp);
}
@@ -1548,8 +1545,7 @@ zpool_import(libzfs_handle_t *hdl, nvlis
ret = zpool_import_props(hdl, config, newname, props,
ZFS_IMPORT_NORMAL);
- if (props)
- nvlist_free(props);
+ nvlist_free(props);
return (ret);
}
@@ -2854,8 +2850,7 @@ zpool_vdev_split(zpool_handle_t *zhp, ch
&children) != 0) {
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"Source pool is missing vdev tree"));
- if (zc_props)
- nvlist_free(zc_props);
+ nvlist_free(zc_props);
return (-1);
}
@@ -3003,10 +2998,8 @@ out:
free(varray);
}
zcmd_free_nvlists(&zc);
- if (zc_props)
- nvlist_free(zc_props);
- if (newconfig)
- nvlist_free(newconfig);
+ nvlist_free(zc_props);
+ nvlist_free(newconfig);
if (freelist) {
nvlist_free(*newroot);
*newroot = NULL;
Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c Tue Mar 8 18:05:23 2016 (r296526)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_sendrecv.c Tue Mar 8 18:08:33 2016 (r296527)
@@ -2753,8 +2753,7 @@ zfs_receive_package(libzfs_handle_t *hdl
out:
fsavl_destroy(stream_avl);
- if (stream_nv)
- nvlist_free(stream_nv);
+ nvlist_free(stream_nv);
if (softerr)
error = -2;
if (anyerr)
More information about the svn-src-all
mailing list