summaryrefslogtreecommitdiff
path: root/usr/src/uts/common
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/common')
-rw-r--r--usr/src/uts/common/avs/ns/nsctl/nsc_trap.c3
-rw-r--r--usr/src/uts/common/contract/device.c3
-rw-r--r--usr/src/uts/common/fs/dev/sdev_ncache.c3
-rw-r--r--usr/src/uts/common/fs/dev/sdev_subr.c15
-rw-r--r--usr/src/uts/common/fs/nfs/nfs4_state.c9
-rw-r--r--usr/src/uts/common/fs/smbsrv/smb_kshare.c6
-rw-r--r--usr/src/uts/common/fs/zfs/spa.c3
-rw-r--r--usr/src/uts/common/fs/zfs/spa_config.c3
-rw-r--r--usr/src/uts/common/fs/zfs/zfs_ioctl.c3
-rw-r--r--usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd.c3
-rw-r--r--usr/src/uts/common/io/comstar/port/iscsit/iscsit.c3
-rw-r--r--usr/src/uts/common/io/comstar/port/pppt/alua_ic_if.c9
-rw-r--r--usr/src/uts/common/io/comstar/stmf/stmf.c6
-rw-r--r--usr/src/uts/common/io/devfm.c9
-rw-r--r--usr/src/uts/common/ipp/ippctl.c3
-rw-r--r--usr/src/uts/common/os/contract.c6
-rw-r--r--usr/src/uts/common/os/damap.c9
-rw-r--r--usr/src/uts/common/os/devid_cache.c3
-rw-r--r--usr/src/uts/common/os/evchannels.c6
-rw-r--r--usr/src/uts/common/os/retire_store.c5
-rw-r--r--usr/src/uts/common/os/sunmdi.c3
-rw-r--r--usr/src/uts/common/os/sunndi.c3
-rw-r--r--usr/src/uts/common/os/zone.c15
-rw-r--r--usr/src/uts/common/xen/os/xvdi.c3
24 files changed, 44 insertions, 90 deletions
diff --git a/usr/src/uts/common/avs/ns/nsctl/nsc_trap.c b/usr/src/uts/common/avs/ns/nsctl/nsc_trap.c
index 156aff7dcb..e66a04b71e 100644
--- a/usr/src/uts/common/avs/ns/nsctl/nsc_trap.c
+++ b/usr/src/uts/common/avs/ns/nsctl/nsc_trap.c
@@ -71,8 +71,7 @@ nsc_do_sysevent(char *driver_name, char *trap_messages, int errorno,
rc = ddi_log_sysevent(info_dip, DDI_VENDOR_SUNW,
SVE_II_CLASS, component, attr_list, NULL, DDI_SLEEP);
out:
- if (attr_list)
- nvlist_free(attr_list);
+ nvlist_free(attr_list);
if (rc != 0) {
cmn_err(CE_WARN, "!%s: unable to log sysevent %d:%s and %d",
diff --git a/usr/src/uts/common/contract/device.c b/usr/src/uts/common/contract/device.c
index 1517bbbe9e..1fc46fab78 100644
--- a/usr/src/uts/common/contract/device.c
+++ b/usr/src/uts/common/contract/device.c
@@ -1923,8 +1923,7 @@ contract_device_publish(dev_info_t *dip, dev_t dev, int spec_type,
mutex_exit(&(DEVI(dip)->devi_ct_lock));
out:
- if (tnvl)
- nvlist_free(tnvl);
+ nvlist_free(tnvl);
if (path)
kmem_free(path, MAXPATHLEN);
diff --git a/usr/src/uts/common/fs/dev/sdev_ncache.c b/usr/src/uts/common/fs/dev/sdev_ncache.c
index 07c93ca041..830d4741ef 100644
--- a/usr/src/uts/common/fs/dev/sdev_ncache.c
+++ b/usr/src/uts/common/fs/dev/sdev_ncache.c
@@ -341,8 +341,7 @@ sdev_ncache_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/fs/dev/sdev_subr.c b/usr/src/uts/common/fs/dev/sdev_subr.c
index b4b27e6285..7f8f968454 100644
--- a/usr/src/uts/common/fs/dev/sdev_subr.c
+++ b/usr/src/uts/common/fs/dev/sdev_subr.c
@@ -160,16 +160,11 @@ static void
sdev_prof_free(struct sdev_node *dv)
{
ASSERT(!SDEV_IS_GLOBAL(dv));
- if (dv->sdev_prof.dev_name)
- nvlist_free(dv->sdev_prof.dev_name);
- if (dv->sdev_prof.dev_map)
- nvlist_free(dv->sdev_prof.dev_map);
- if (dv->sdev_prof.dev_symlink)
- nvlist_free(dv->sdev_prof.dev_symlink);
- if (dv->sdev_prof.dev_glob_incdir)
- nvlist_free(dv->sdev_prof.dev_glob_incdir);
- if (dv->sdev_prof.dev_glob_excdir)
- nvlist_free(dv->sdev_prof.dev_glob_excdir);
+ nvlist_free(dv->sdev_prof.dev_name);
+ nvlist_free(dv->sdev_prof.dev_map);
+ nvlist_free(dv->sdev_prof.dev_symlink);
+ nvlist_free(dv->sdev_prof.dev_glob_incdir);
+ nvlist_free(dv->sdev_prof.dev_glob_excdir);
bzero(&dv->sdev_prof, sizeof (dv->sdev_prof));
}
diff --git a/usr/src/uts/common/fs/nfs/nfs4_state.c b/usr/src/uts/common/fs/nfs/nfs4_state.c
index 9f743caf70..47941454bc 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_state.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_state.c
@@ -1066,8 +1066,7 @@ rfs4_dss_setpaths(char *buf, size_t buflen)
* Before we lose the ptr, destroy the nvlist and pathnames
* array from the warm start before this one.
*/
- if (rfs4_dss_oldpaths)
- nvlist_free(rfs4_dss_oldpaths);
+ nvlist_free(rfs4_dss_oldpaths);
rfs4_dss_oldpaths = rfs4_dss_paths;
}
@@ -1465,10 +1464,8 @@ rfs4_state_fini()
rfs4_seen_first_compound = 0;
/* DSS: distributed stable storage */
- if (rfs4_dss_oldpaths)
- nvlist_free(rfs4_dss_oldpaths);
- if (rfs4_dss_paths)
- nvlist_free(rfs4_dss_paths);
+ nvlist_free(rfs4_dss_oldpaths);
+ nvlist_free(rfs4_dss_paths);
rfs4_dss_paths = rfs4_dss_oldpaths = NULL;
}
diff --git a/usr/src/uts/common/fs/smbsrv/smb_kshare.c b/usr/src/uts/common/fs/smbsrv/smb_kshare.c
index bf3129d130..2781c0b2a9 100644
--- a/usr/src/uts/common/fs/smbsrv/smb_kshare.c
+++ b/usr/src/uts/common/fs/smbsrv/smb_kshare.c
@@ -428,8 +428,7 @@ smb_kshare_export_list(smb_ioc_share_t *ioc)
rc = 0;
out:
- if (shrlist != NULL)
- nvlist_free(shrlist);
+ nvlist_free(shrlist);
smb_server_release(sv);
return (rc);
}
@@ -490,8 +489,7 @@ smb_kshare_unexport_list(smb_ioc_share_t *ioc)
rc = 0;
out:
- if (shrlist != NULL)
- nvlist_free(shrlist);
+ nvlist_free(shrlist);
smb_server_release(sv);
return (rc);
}
diff --git a/usr/src/uts/common/fs/zfs/spa.c b/usr/src/uts/common/fs/zfs/spa.c
index 1edac65700..decc58fdb3 100644
--- a/usr/src/uts/common/fs/zfs/spa.c
+++ b/usr/src/uts/common/fs/zfs/spa.c
@@ -6006,8 +6006,7 @@ spa_sync_config_object(spa_t *spa, dmu_tx_t *tx)
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);
diff --git a/usr/src/uts/common/fs/zfs/spa_config.c b/usr/src/uts/common/fs/zfs/spa_config.c
index 47bb595908..69fe1f8e77 100644
--- a/usr/src/uts/common/fs/zfs/spa_config.c
+++ b/usr/src/uts/common/fs/zfs/spa_config.c
@@ -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);
}
diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c
index ae66e4261f..87a2a99086 100644
--- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c
+++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c
@@ -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);
}
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);
diff --git a/usr/src/uts/common/ipp/ippctl.c b/usr/src/uts/common/ipp/ippctl.c
index 240de00398..6d368a653b 100644
--- a/usr/src/uts/common/ipp/ippctl.c
+++ b/usr/src/uts/common/ipp/ippctl.c
@@ -1243,8 +1243,7 @@ ippctl_action_modify(
*/
if ((rc = ippctl_set_rc(ipp_rc)) != 0) {
- if (nvlp != NULL)
- nvlist_free(nvlp);
+ nvlist_free(nvlp);
return (rc);
}
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);
diff --git a/usr/src/uts/common/xen/os/xvdi.c b/usr/src/uts/common/xen/os/xvdi.c
index d30da59dc8..85dd5d7d81 100644
--- a/usr/src/uts/common/xen/os/xvdi.c
+++ b/usr/src/uts/common/xen/os/xvdi.c
@@ -1744,8 +1744,7 @@ xvdi_post_event(dev_info_t *dip, xendev_hotplug_cmd_t hpc)
}
failure:
- if (attr_list != NULL)
- nvlist_free(attr_list);
+ nvlist_free(attr_list);
return (err);
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-12 00:55:17 +0000