c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 18:40:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Illumos 6659 - nvlist_free(NULL) is a no-op

Browse Source 
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>

References:
  https://www.illumos.org/issues/6659
  https://github.com/illumos/illumos-gate/commit/aab83bb

Ported-by: David Quigley <dpquigl@davequigley.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4566
This commit is contained in:
Josef 'Jeff' Sipek
2016-03-31 23:54:07 -04:00
committed by Brian Behlendorf
parent 16794374b3
commit 8a5fc74880
11 changed files with 19 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libzfs/libzfs_config.c
+1 -2
View File
@@ -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;
}
lib/libzfs/libzfs_dataset.c
+2 -4
View File
@@ -2079,8 +2079,7 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t prop, zprop_source_t *src,
zcmd_free_nvlists(&zc);
return (-1);
}
if (zplprops)
nvlist_free(zplprops);
nvlist_free(zplprops);
zcmd_free_nvlists(&zc);
break;
@@ -4269,8 +4268,7 @@ zfs_smb_acl_mgmt(libzfs_handle_t *hdl, char *dataset, char *path,
return (-1);
}
error = ioctl(hdl->libzfs_fd, ZFS_IOC_SMB_ACL, &zc);
if (nvlist)
nvlist_free(nvlist);
nvlist_free(nvlist);
return (error);
}
lib/libzfs/libzfs_import.c
+1 -2
View File
@@ -1973,8 +1973,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);
lib/libzfs/libzfs_pool.c
+7 -14
View File
@@ -1146,12 +1146,9 @@ zpool_open(libzfs_handle_t *hdl, const char *pool)
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);
}
@@ -1688,8 +1685,7 @@ zpool_import(libzfs_handle_t *hdl, nvlist_t *config, const char *newname,
ret = zpool_import_props(hdl, config, newname, props,
ZFS_IMPORT_NORMAL);
if (props)
nvlist_free(props);
nvlist_free(props);
return (ret);
}
@@ -2959,8 +2955,7 @@ zpool_vdev_split(zpool_handle_t *zhp, char *newname, nvlist_t **newroot,
&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);
}
@@ -3108,10 +3103,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;
lib/libzfs/libzfs_sendrecv.c
+1 -2
View File
@@ -2545,8 +2545,7 @@ zfs_receive_package(libzfs_handle_t *hdl, int fd, const char *destname,
out:
fsavl_destroy(stream_avl);
if (stream_nv)
nvlist_free(stream_nv);
nvlist_free(stream_nv);
if (softerr)
error = -2;
if (anyerr)