summaryrefslogtreecommitdiff
path: root/usr/src/lib/libpool
diff options
context:
space:
mode:
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>2016-02-24 11:58:55 -0500
committerRobert Mustacchi <rm@joyent.com>2016-02-27 08:52:10 -0800
commitaab83bb83be7342f6cfccaed8d5fe0b2f404855d (patch)
tree548e8760643ee94860fb29486fbf965675c52a59 /usr/src/lib/libpool
parentd643a855cbd8c4fb4fe966406fa05dff70673597 (diff)
downloadillumos-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/lib/libpool')
-rw-r--r--usr/src/lib/libpool/common/pool_kernel.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/lib/libpool/common/pool_kernel.c b/usr/src/lib/libpool/common/pool_kernel.c
index 2e1375e499..2179a7f0ea 100644
--- a/usr/src/lib/libpool/common/pool_kernel.c
+++ b/usr/src/lib/libpool/common/pool_kernel.c
@@ -2415,8 +2415,7 @@ pool_knl_put_property(pool_elem_t *pe, const char *name,
return (PO_FAIL);
if (prov->pkc_log->l_state != LS_DO) {
- if (bl)
- nvlist_free(bl);
+ nvlist_free(bl);
return (PO_SUCCESS);
}
/*
@@ -3460,8 +3459,7 @@ log_item_release(log_item_t *li)
case POOL_PROPPUT:
propput = (pool_propput_undo_t *)li->li_details;
- if (propput->ppu_blist)
- nvlist_free(propput->ppu_blist);
+ nvlist_free(propput->ppu_blist);
free(propput->ppu_ioctl.pp_o_buf);
free(propput);
break;