From aab83bb83be7342f6cfccaed8d5fe0b2f404855d Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Wed, 24 Feb 2016 11:58:55 -0500 Subject: 6659 nvlist_free(NULL) is a no-op Reviewed by: Toomas Soome Reviewed by: Marcel Telka Approved by: Robert Mustacchi --- usr/src/lib/libpool/common/pool_kernel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'usr/src/lib/libpool/common') 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; -- cgit v1.2.3