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>

8 files changed, 16 insertions, 34 deletions

diff --git a/usr/src/uts/common/os/contract.c b/usr/src/uts/common/os/contract.c
index f3c888a1db..249066674e 100644
--- a/usr/src/uts/common/os/contract.c
+++ b/usr/src/uts/common/os/contract.c
@@ -1837,10 +1837,8 @@ cte_rele(ct_kevent_t *e)
 	contract_rele(e->cte_contract);
 
 	mutex_destroy(&e->cte_lock);
-	if (e->cte_data)
-		nvlist_free(e->cte_data);
-	if (e->cte_gdata)
-		nvlist_free(e->cte_gdata);
+	nvlist_free(e->cte_data);
+	nvlist_free(e->cte_gdata);
 	kmem_free(e, sizeof (ct_kevent_t));
 }
 
diff --git a/usr/src/uts/common/os/damap.c b/usr/src/uts/common/os/damap.c
index e311d75867..f90c5569c4 100644
--- a/usr/src/uts/common/os/damap.c
+++ b/usr/src/uts/common/os/damap.c
@@ -1110,12 +1110,10 @@ dam_deact_cleanup(dam_t *mapp, id_t addrid, char *addrstr,
 	mutex_enter(&mapp->dam_lock);
 	bitset_del(&mapp->dam_active_set, addrid);
 	passp->da_ppriv = NULL;
-	if (passp->da_nvl)
-		nvlist_free(passp->da_nvl);
+	nvlist_free(passp->da_nvl);
 	passp->da_nvl = NULL;
 	passp->da_ppriv_rpt = NULL;
-	if (passp->da_nvl_rpt)
-		nvlist_free(passp->da_nvl_rpt);
+	nvlist_free(passp->da_nvl_rpt);
 	passp->da_nvl_rpt = NULL;
 
 	DTRACE_PROBE3(damap__addr__deactivate__end,
@@ -1658,8 +1656,7 @@ dam_addr_report_release(dam_t *mapp, id_t addrid)
 		mutex_enter(&mapp->dam_lock);
 	}
 	passp->da_ppriv_rpt = NULL;
-	if (passp->da_nvl_rpt)
-		nvlist_free(passp->da_nvl_rpt);
+	nvlist_free(passp->da_nvl_rpt);
 }
 
 /*
diff --git a/usr/src/uts/common/os/devid_cache.c b/usr/src/uts/common/os/devid_cache.c
index a12a589f4c..baa8ab845b 100644
--- a/usr/src/uts/common/os/devid_cache.c
+++ b/usr/src/uts/common/os/devid_cache.c
@@ -343,8 +343,7 @@ devid_cache_pack_list(nvf_handle_t fd, nvlist_t **ret_nvl)
 	return (DDI_SUCCESS);
 
 err:
-	if (sub_nvl)
-		nvlist_free(sub_nvl);
+	nvlist_free(sub_nvl);
 	nvlist_free(nvl);
 	*ret_nvl = NULL;
 	return (DDI_FAILURE);
diff --git a/usr/src/uts/common/os/evchannels.c b/usr/src/uts/common/os/evchannels.c
index 3495dcfcfa..092dd42f2e 100644
--- a/usr/src/uts/common/os/evchannels.c
+++ b/usr/src/uts/common/os/evchannels.c
@@ -1164,8 +1164,7 @@ evch_chunbind(evch_bind_t *bp)
 		mutex_exit(&chp->ch_mutex);
 		evch_dl_del(&eg->evch_list, &chp->ch_link);
 		evch_evq_destroy(chp->ch_queue);
-		if (chp->ch_propnvl)
-			nvlist_free(chp->ch_propnvl);
+		nvlist_free(chp->ch_propnvl);
 		mutex_destroy(&chp->ch_mutex);
 		mutex_destroy(&chp->ch_pubmx);
 		cv_destroy(&chp->ch_pubcv);
@@ -1572,8 +1571,7 @@ evch_chsetpropnvl(evch_bind_t *bp, nvlist_t *nvl)
 
 	mutex_enter(&chp->ch_mutex);
 
-	if (chp->ch_propnvl)
-		nvlist_free(chp->ch_propnvl);
+	nvlist_free(chp->ch_propnvl);
 
 	chp->ch_propnvl = nvl;
 	chp->ch_propnvlgen++;
diff --git a/usr/src/uts/common/os/retire_store.c b/usr/src/uts/common/os/retire_store.c
index f1c3db9445..a934379af4 100644
--- a/usr/src/uts/common/os/retire_store.c
+++ b/usr/src/uts/common/os/retire_store.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/ddi.h>
 #include <sys/sunddi.h>
 #include <sys/sunndi.h>
@@ -310,8 +308,7 @@ rio_store_encode(nvf_handle_t nvfh, nvlist_t **ret_nvl)
 	return (DDI_SUCCESS);
 
 error:
-	if (line_nvl)
-		nvlist_free(line_nvl);
+	nvlist_free(line_nvl);
 	ASSERT(nvl);
 	nvlist_free(nvl);
 	return (DDI_FAILURE);
diff --git a/usr/src/uts/common/os/sunmdi.c b/usr/src/uts/common/os/sunmdi.c
index a84dfc74de..63645cfe54 100644
--- a/usr/src/uts/common/os/sunmdi.c
+++ b/usr/src/uts/common/os/sunmdi.c
@@ -8029,8 +8029,7 @@ vhcache_to_mainnvl(mdi_vhci_cache_t *vhcache)
 
 	rw_exit(&vhcache->vhcache_lock);
 out:
-	if (nvl)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 	return (NULL);
 }
 
diff --git a/usr/src/uts/common/os/sunndi.c b/usr/src/uts/common/os/sunndi.c
index 04a07fde29..93c66fbcf9 100644
--- a/usr/src/uts/common/os/sunndi.c
+++ b/usr/src/uts/common/os/sunndi.c
@@ -420,8 +420,7 @@ ndi_dc_freehdl(struct devctl_iocdata *dcp)
 	if (dcp->c_unitaddr != NULL)
 		kmem_free(dcp->c_unitaddr, MAXNAMELEN);
 
-	if (dcp->nvl_user != NULL)
-		nvlist_free(dcp->nvl_user);
+	nvlist_free(dcp->nvl_user);
 
 	kmem_free(dcp, sizeof (*dcp));
 }
diff --git a/usr/src/uts/common/os/zone.c b/usr/src/uts/common/os/zone.c
index 706e5ed16f..9a1c41172b 100644
--- a/usr/src/uts/common/os/zone.c
+++ b/usr/src/uts/common/os/zone.c
@@ -4401,8 +4401,7 @@ zone_create(const char *zone_name, const char *zone_root,
 	 */
 	if (curthread != pp->p_agenttp && !holdlwps(SHOLDFORK)) {
 		zone_free(zone);
-		if (rctls)
-			nvlist_free(rctls);
+		nvlist_free(rctls);
 		return (zone_create_error(error, 0, extended_error));
 	}
 
@@ -4412,8 +4411,7 @@ zone_create(const char *zone_name, const char *zone_root,
 			continuelwps(pp);
 		mutex_exit(&pp->p_lock);
 		zone_free(zone);
-		if (rctls)
-			nvlist_free(rctls);
+		nvlist_free(rctls);
 		return (zone_create_error(error, 0, extended_error));
 	}
 
@@ -4558,8 +4556,7 @@ zone_create(const char *zone_name, const char *zone_root,
 	 * The zone is fully visible, so we can let mounts progress.
 	 */
 	resume_mounts(zone);
-	if (rctls)
-		nvlist_free(rctls);
+	nvlist_free(rctls);
 
 	return (zoneid);
 
@@ -4574,8 +4571,7 @@ errout:
 	mutex_exit(&pp->p_lock);
 
 	resume_mounts(zone);
-	if (rctls)
-		nvlist_free(rctls);
+	nvlist_free(rctls);
 	/*
 	 * There is currently one reference to the zone, a cred_ref from
 	 * zone_kcred.  To free the zone, we call crfree, which will call
@@ -6875,8 +6871,7 @@ zone_remove_datalink(zoneid_t zoneid, datalink_id_t linkid)
 		err = ENXIO;
 	} else {
 		list_remove(&zone->zone_dl_list, zdl);
-		if (zdl->zdl_net != NULL)
-			nvlist_free(zdl->zdl_net);
+		nvlist_free(zdl->zdl_net);
 		kmem_free(zdl, sizeof (zone_dl_t));
 	}
 	mutex_exit(&zone->zone_lock);