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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/dev/sdev_subr.c
          +++ new/usr/src/uts/common/fs/dev/sdev_subr.c
↓ open down ↓ 152 lines elided ↑ open up ↑
 153  153  /* static */
 154  154  static struct vnodeops *sdev_get_vop(struct sdev_node *);
 155  155  static void sdev_set_no_negcache(struct sdev_node *);
 156  156  static fs_operation_def_t *sdev_merge_vtab(const fs_operation_def_t []);
 157  157  static void sdev_free_vtab(fs_operation_def_t *);
 158  158  
 159  159  static void
 160  160  sdev_prof_free(struct sdev_node *dv)
 161  161  {
 162  162          ASSERT(!SDEV_IS_GLOBAL(dv));
 163      -        if (dv->sdev_prof.dev_name)
 164      -                nvlist_free(dv->sdev_prof.dev_name);
 165      -        if (dv->sdev_prof.dev_map)
 166      -                nvlist_free(dv->sdev_prof.dev_map);
 167      -        if (dv->sdev_prof.dev_symlink)
 168      -                nvlist_free(dv->sdev_prof.dev_symlink);
 169      -        if (dv->sdev_prof.dev_glob_incdir)
 170      -                nvlist_free(dv->sdev_prof.dev_glob_incdir);
 171      -        if (dv->sdev_prof.dev_glob_excdir)
 172      -                nvlist_free(dv->sdev_prof.dev_glob_excdir);
      163 +        nvlist_free(dv->sdev_prof.dev_name);
      164 +        nvlist_free(dv->sdev_prof.dev_map);
      165 +        nvlist_free(dv->sdev_prof.dev_symlink);
      166 +        nvlist_free(dv->sdev_prof.dev_glob_incdir);
      167 +        nvlist_free(dv->sdev_prof.dev_glob_excdir);
 173  168          bzero(&dv->sdev_prof, sizeof (dv->sdev_prof));
 174  169  }
 175  170  
 176  171  /* sdev_node cache constructor */
 177  172  /*ARGSUSED1*/
 178  173  static int
 179  174  i_sdev_node_ctor(void *buf, void *cfarg, int flag)
 180  175  {
 181  176          struct sdev_node *dv = (struct sdev_node *)buf;
 182  177          struct vnode *vp;
↓ open down ↓ 2966 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX