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/evchannels.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/evchannels.c')
| -rw-r--r-- | usr/src/uts/common/os/evchannels.c | 6 |
1 files changed, 2 insertions, 4 deletions
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++; |