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/pppt/alua_ic_if.c
          +++ new/usr/src/uts/common/io/comstar/port/pppt/alua_ic_if.c
↓ open down ↓ 347 lines elided ↑ open up ↑
 348  348          if (err) {
 349  349                  status = STMF_IC_MSG_INTERNAL_ERROR;
 350  350                  goto done;
 351  351          }
 352  352  
 353  353          /* push the bits out on the wire */
 354  354  
 355  355          status = stmf_ic_transmit(buf, size);
 356  356  
 357  357  done:
 358      -        if (nvl)
 359      -                nvlist_free(nvl);
      358 +        nvlist_free(nvl);
 360  359  
 361  360          if (buf)
 362  361                  kmem_free(buf, size);
 363  362  
 364  363          stmf_ic_msg_free(msg);
 365  364  
 366  365  
 367  366          return (status);
 368  367  }
 369  368  
↓ open down ↓ 594 lines elided ↑ open up ↑
 964  963                  break;
 965  964  
 966  965          case STMF_ICM_MAX_MSG_TYPE:
 967  966                  ASSERT(0);
 968  967                  break;
 969  968  
 970  969          default:
 971  970                  ASSERT(0);
 972  971          }
 973  972  
 974      -        if (msg->icm_nvlist)
 975      -                nvlist_free(msg->icm_nvlist);
      973 +        nvlist_free(msg->icm_nvlist);
 976  974  
 977  975          kmem_free(msg, sizeof (*msg));
 978  976  }
 979  977  
 980  978  /*ARGSUSED*/
 981  979  static void
 982  980  stmf_ic_reg_port_msg_free(stmf_ic_reg_port_msg_t *m,
 983  981      stmf_ic_msg_construction_method_t cmethod)
 984  982  {
 985  983          scsi_devid_desc_free(m->icrp_port_id);
↓ open down ↓ 183 lines elided ↑ open up ↑
1169 1167                  break;
1170 1168  
1171 1169          default:
1172 1170                  ASSERT(0);
1173 1171          }
1174 1172  
1175 1173  done:
1176 1174          if (!rc)
1177 1175                  return (nvl);
1178 1176  
1179      -        if (nvl)
1180      -                nvlist_free(nvl);
     1177 +        nvlist_free(nvl);
1181 1178  
1182 1179          return (NULL);
1183 1180  }
1184 1181  
1185 1182  
1186 1183  static int
1187 1184  stmf_ic_reg_port_msg_marshal(nvlist_t *nvl, void *msg)
1188 1185  {
1189 1186          stmf_ic_reg_port_msg_t *m = (stmf_ic_reg_port_msg_t *)msg;
1190 1187          int rc = 0;
↓ open down ↓ 1103 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX