diff options
| author | Josef 'Jeff' Sipek <jeffpc@josefsipek.net> | 2016-02-24 11:58:55 -0500 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2016-02-27 08:52:10 -0800 |
| commit | aab83bb83be7342f6cfccaed8d5fe0b2f404855d (patch) | |
| tree | 548e8760643ee94860fb29486fbf965675c52a59 /usr/src/uts/common/os/zone.c | |
| parent | d643a855cbd8c4fb4fe966406fa05dff70673597 (diff) | |
| download | illumos-joyent-aab83bb83be7342f6cfccaed8d5fe0b2f404855d.tar.gz | |
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>
Diffstat (limited to 'usr/src/uts/common/os/zone.c')
| -rw-r--r-- | usr/src/uts/common/os/zone.c | 15 |
1 files changed, 5 insertions, 10 deletions
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); |