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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/comstar/stmf/stmf.c
          +++ new/usr/src/uts/common/io/comstar/stmf/stmf.c
↓ open down ↓ 2517 lines elided ↑ open up ↑
2518 2518                  }
2519 2519          }
2520 2520  
2521 2521          if ((ret = nvlist_unpack((char *)ppi->ppi_data,
2522 2522              (size_t)ppi->ppi_data_size, &nv, KM_NOSLEEP)) != 0) {
2523 2523                  mutex_exit(&stmf_state.stmf_lock);
2524 2524                  return (ret);
2525 2525          }
2526 2526  
2527 2527          /* Free any existing lists and add this one to the ppd */
2528      -        if (ppd->ppd_nv)
2529      -                nvlist_free(ppd->ppd_nv);
     2528 +        nvlist_free(ppd->ppd_nv);
2530 2529          ppd->ppd_nv = nv;
2531 2530  
2532 2531          /* set the token for writes */
2533 2532          ppd->ppd_token++;
2534 2533          /* return token to caller */
2535 2534          if (ppi_token) {
2536 2535                  *ppi_token = ppd->ppd_token;
2537 2536          }
2538 2537  
2539 2538          /* If there is a provider registered, do the notifications */
↓ open down ↓ 51 lines elided ↑ open up ↑
2591 2590          for (pppd = &stmf_state.stmf_ppdlist; *pppd != NULL;
2592 2591              pppd = &((*pppd)->ppd_next)) {
2593 2592                  if (*pppd == ppd)
2594 2593                          break;
2595 2594          }
2596 2595  
2597 2596          if (*pppd == NULL)
2598 2597                  return;
2599 2598  
2600 2599          *pppd = ppd->ppd_next;
2601      -        if (ppd->ppd_nv)
2602      -                nvlist_free(ppd->ppd_nv);
     2600 +        nvlist_free(ppd->ppd_nv);
2603 2601  
2604 2602          kmem_free(ppd, ppd->ppd_alloc_size);
2605 2603  }
2606 2604  
2607 2605  int
2608 2606  stmf_delete_ppd_ioctl(stmf_ppioctl_data_t *ppi)
2609 2607  {
2610 2608          stmf_pp_data_t *ppd;
2611 2609          int ret = ENOENT;
2612 2610  
↓ open down ↓ 5381 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX