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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c
          +++ new/usr/src/uts/common/io/comstar/port/iscsit/iscsit.c
↓ open down ↓ 555 lines elided ↑ open up ↑
 556  556  
 557  557                  /* Update config */
 558  558                  rc = iscsit_config_merge(cfg);
 559  559                  /* FALLTHROUGH */
 560  560  
 561  561  cleanup:
 562  562                  if (cfg)
 563  563                          it_config_free_cmn(cfg);
 564  564                  if (cfg_pnvlist)
 565  565                          kmem_free(cfg_pnvlist, setcfg.set_cfg_pnvlist_len);
 566      -                if (cfg_nvlist)
 567      -                        nvlist_free(cfg_nvlist);
      566 +                nvlist_free(cfg_nvlist);
 568  567  
 569  568                  /*
 570  569                   * Now that the reconfig is complete set our state back to
 571  570                   * enabled.
 572  571                   */
 573  572                  mutex_enter(&iscsit_global.global_state_mutex);
 574  573                  iscsit_global.global_svc_state = ISE_ENABLED;
 575  574                  mutex_exit(&iscsit_global.global_state_mutex);
 576  575                  break;
 577  576          case ISCSIT_IOC_ENABLE_SVC: {
↓ open down ↓ 2854 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX