diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-29 12:17:08 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-29 12:17:08 +0000 |
| commit | 67c3f4c9f70c40ce0dd12db8804e720c3a0c0c79 (patch) | |
| tree | a3220c2c4058a61e04dd53a843726a6dd4266a54 /usr/src/uts/common/os/zone.c | |
| parent | e5490f12d073ec144d62bc50456b750256cc7c0a (diff) | |
| parent | aab83bb83be7342f6cfccaed8d5fe0b2f404855d (diff) | |
| download | illumos-joyent-67c3f4c9f70c40ce0dd12db8804e720c3a0c0c79.tar.gz | |
[illumos-gate merge]
commit aab83bb83be7342f6cfccaed8d5fe0b2f404855d
6659 nvlist_free(NULL) is a no-op
commit d643a855cbd8c4fb4fe966406fa05dff70673597
6674 sys/isa_defs.h shouldn't unconditionally define _ILP32
commit bcf23f43dc1b73080eeded927585ee86feab40a7
6596 Macro redefined in strtolctype.h
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 b1df79d006..4906f82116 100644 --- a/usr/src/uts/common/os/zone.c +++ b/usr/src/uts/common/os/zone.c @@ -5011,8 +5011,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)); } @@ -5022,8 +5021,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)); } @@ -5168,8 +5166,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); @@ -5184,8 +5181,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 @@ -7546,8 +7542,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); |