Print this page
6659 nvlist_free(NULL) is a no-op

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libpool/common/pool_kernel.c
          +++ new/usr/src/lib/libpool/common/pool_kernel.c
↓ open down ↓ 2407 lines elided ↑ open up ↑
2408 2408                          nvlist_free(bl);
2409 2409                          pool_seterror(POE_SYSTEM);
2410 2410                          return (PO_FAIL);
2411 2411                  }
2412 2412          }
2413 2413          if (pool_knl_nvlist_add_value(pke->pke_properties, name, val) !=
2414 2414              PO_SUCCESS)
2415 2415                  return (PO_FAIL);
2416 2416  
2417 2417          if (prov->pkc_log->l_state != LS_DO) {
2418      -                if (bl)
2419      -                        nvlist_free(bl);
     2418 +                nvlist_free(bl);
2420 2419                  return (PO_SUCCESS);
2421 2420          }
2422 2421          /*
2423 2422           * The remaining logic is setting up the arguments for the
2424 2423           * POOL_PROPPUT ioctl and appending the details into the log.
2425 2424           */
2426 2425          if ((propput = malloc(sizeof (pool_propput_undo_t))) == NULL) {
2427 2426                  pool_seterror(POE_SYSTEM);
2428 2427                  return (PO_FAIL);
2429 2428          }
↓ open down ↓ 1023 lines elided ↑ open up ↑
3453 3452          case POOL_XTRANSFER:
3454 3453                  xtransfer = (pool_xtransfer_undo_t *)li->li_details;
3455 3454  
3456 3455                  free(xtransfer->pxu_rl);
3457 3456                  free(xtransfer->pxu_ioctl.px_o_comp_list);
3458 3457                  free(xtransfer);
3459 3458                  break;
3460 3459          case POOL_PROPPUT:
3461 3460                  propput = (pool_propput_undo_t *)li->li_details;
3462 3461  
3463      -                if (propput->ppu_blist)
3464      -                        nvlist_free(propput->ppu_blist);
     3462 +                nvlist_free(propput->ppu_blist);
3465 3463                  free(propput->ppu_ioctl.pp_o_buf);
3466 3464                  free(propput);
3467 3465                  break;
3468 3466          case POOL_PROPRM:
3469 3467                  proprm = (pool_proprm_undo_t *)li->li_details;
3470 3468  
3471 3469                  free(proprm);
3472 3470                  break;
3473 3471          default:
3474 3472                  return (PO_FAIL);
↓ open down ↓ 117 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX