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/evchannels.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/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++; |