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>

5 files changed, 10 insertions, 20 deletions

diff --git a/usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd.c b/usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd.c
index e8a4b13138..81e63367c5 100644
--- a/usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd.c
+++ b/usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd.c
@@ -3639,8 +3639,7 @@ again:
 		}
 	}
 out:
-	if (nv != NULL)
-		nvlist_free(nv);
+	nvlist_free(nv);
 	kmem_free((void *)(uintptr_t)zc->zc_nvlist_dst, size);
 	kmem_free(zc, sizeof (zfs_cmd_t));
 	(void) ldi_close(zfs_lh, FREAD|FWRITE, kcred);
diff --git a/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c b/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c
index 1e852526c3..5d2d4e77b4 100644
--- a/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c
+++ b/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c
@@ -563,8 +563,7 @@ cleanup:
 			it_config_free_cmn(cfg);
 		if (cfg_pnvlist)
 			kmem_free(cfg_pnvlist, setcfg.set_cfg_pnvlist_len);
-		if (cfg_nvlist)
-			nvlist_free(cfg_nvlist);
+		nvlist_free(cfg_nvlist);
 
 		/*
 		 * Now that the reconfig is complete set our state back to
diff --git a/usr/src/uts/common/io/comstar/port/pppt/alua_ic_if.c b/usr/src/uts/common/io/comstar/port/pppt/alua_ic_if.c
index 2bff5afef1..65e0c3d23b 100644
--- a/usr/src/uts/common/io/comstar/port/pppt/alua_ic_if.c
+++ b/usr/src/uts/common/io/comstar/port/pppt/alua_ic_if.c
@@ -355,8 +355,7 @@ stmf_ic_tx_msg(stmf_ic_msg_t *msg)
 	status = stmf_ic_transmit(buf, size);
 
 done:
-	if (nvl)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	if (buf)
 		kmem_free(buf, size);
@@ -971,8 +970,7 @@ stmf_ic_msg_free(stmf_ic_msg_t *msg)
 		ASSERT(0);
 	}
 
-	if (msg->icm_nvlist)
-		nvlist_free(msg->icm_nvlist);
+	nvlist_free(msg->icm_nvlist);
 
 	kmem_free(msg, sizeof (*msg));
 }
@@ -1176,8 +1174,7 @@ done:
 	if (!rc)
 		return (nvl);
 
-	if (nvl)
-		nvlist_free(nvl);
+	nvlist_free(nvl);
 
 	return (NULL);
 }
diff --git a/usr/src/uts/common/io/comstar/stmf/stmf.c b/usr/src/uts/common/io/comstar/stmf/stmf.c
index 2cc69a6e38..37d79a371c 100644
--- a/usr/src/uts/common/io/comstar/stmf/stmf.c
+++ b/usr/src/uts/common/io/comstar/stmf/stmf.c
@@ -2525,8 +2525,7 @@ stmf_load_ppd_ioctl(stmf_ppioctl_data_t *ppi, uint64_t *ppi_token,
 	}
 
 	/* Free any existing lists and add this one to the ppd */
-	if (ppd->ppd_nv)
-		nvlist_free(ppd->ppd_nv);
+	nvlist_free(ppd->ppd_nv);
 	ppd->ppd_nv = nv;
 
 	/* set the token for writes */
@@ -2598,8 +2597,7 @@ stmf_delete_ppd(stmf_pp_data_t *ppd)
 		return;
 
 	*pppd = ppd->ppd_next;
-	if (ppd->ppd_nv)
-		nvlist_free(ppd->ppd_nv);
+	nvlist_free(ppd->ppd_nv);
 
 	kmem_free(ppd, ppd->ppd_alloc_size);
 }
diff --git a/usr/src/uts/common/io/devfm.c b/usr/src/uts/common/io/devfm.c
index 221338de7e..eb5e24079e 100644
--- a/usr/src/uts/common/io/devfm.c
+++ b/usr/src/uts/common/io/devfm.c
@@ -298,12 +298,10 @@ fm_ioctl(dev_t dev, int cmd, intptr_t data, int flag, cred_t *cred, int *rvalp)
 
 	err = subr->func(cmd, invl, &onvl);
 
-	if (invl != NULL)
-		nvlist_free(invl);
+	nvlist_free(invl);
 
 	if (err != 0) {
-		if (onvl != NULL)
-			nvlist_free(onvl);
+		nvlist_free(onvl);
 		return (err);
 	}
 
@@ -425,8 +423,7 @@ _fini(void)
 	int ret;
 
 	if ((ret = mod_remove(&modlinkage)) == 0) {
-		if (fm_vers_nvl != NULL)
-			nvlist_free(fm_vers_nvl);
+		nvlist_free(fm_vers_nvl);
 	}
 
 	return (ret);