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

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libzfs/common/libzfs_dataset.c
          +++ new/usr/src/lib/libzfs/common/libzfs_dataset.c
↓ open down ↓ 2002 lines elided ↑ open up ↑
2003 2003                  if (zfs_ioctl(zhp->zfs_hdl, ZFS_IOC_OBJSET_ZPLPROPS, &zc)) {
2004 2004                          zcmd_free_nvlists(&zc);
2005 2005                          return (-1);
2006 2006                  }
2007 2007                  if (zcmd_read_dst_nvlist(zhp->zfs_hdl, &zc, &zplprops) != 0 ||
2008 2008                      nvlist_lookup_uint64(zplprops, zfs_prop_to_name(prop),
2009 2009                      val) != 0) {
2010 2010                          zcmd_free_nvlists(&zc);
2011 2011                          return (-1);
2012 2012                  }
2013      -                if (zplprops)
2014      -                        nvlist_free(zplprops);
     2013 +                nvlist_free(zplprops);
2015 2014                  zcmd_free_nvlists(&zc);
2016 2015                  break;
2017 2016  
2018 2017          case ZFS_PROP_INCONSISTENT:
2019 2018                  *val = zhp->zfs_dmustats.dds_inconsistent;
2020 2019                  break;
2021 2020  
2022 2021          default:
2023 2022                  switch (zfs_prop_get_type(prop)) {
2024 2023                  case PROP_TYPE_NUMBER:
↓ open down ↓ 2210 lines elided ↑ open up ↑
4235 4234                          nvlist_free(nvlist);
4236 4235                          return (-1);
4237 4236                  }
4238 4237                  break;
4239 4238          case ZFS_SMB_ACL_PURGE:
4240 4239                  break;
4241 4240          default:
4242 4241                  return (-1);
4243 4242          }
4244 4243          error = ioctl(hdl->libzfs_fd, ZFS_IOC_SMB_ACL, &zc);
4245      -        if (nvlist)
4246      -                nvlist_free(nvlist);
     4244 +        nvlist_free(nvlist);
4247 4245          return (error);
4248 4246  }
4249 4247  
4250 4248  int
4251 4249  zfs_smb_acl_add(libzfs_handle_t *hdl, char *dataset,
4252 4250      char *path, char *resource)
4253 4251  {
4254 4252          return (zfs_smb_acl_mgmt(hdl, dataset, path, ZFS_SMB_ACL_ADD,
4255 4253              resource, NULL));
4256 4254  }
↓ open down ↓ 499 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX