From aab83bb83be7342f6cfccaed8d5fe0b2f404855d Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Wed, 24 Feb 2016 11:58:55 -0500 Subject: 6659 nvlist_free(NULL) is a no-op Reviewed by: Toomas Soome Reviewed by: Marcel Telka Approved by: Robert Mustacchi --- usr/src/cmd/zoneadm/zfs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'usr/src/cmd/zoneadm') diff --git a/usr/src/cmd/zoneadm/zfs.c b/usr/src/cmd/zoneadm/zfs.c index d27b9c4678..a279cd6823 100644 --- a/usr/src/cmd/zoneadm/zfs.c +++ b/usr/src/cmd/zoneadm/zfs.c @@ -381,8 +381,7 @@ clone_snap(char *snapshot_name, char *zonepath) "off") != 0) || (nvlist_add_string(props, zfs_prop_to_name(ZFS_PROP_SHARESMB), "off") != 0)) { - if (props != NULL) - nvlist_free(props); + nvlist_free(props); (void) fprintf(stderr, gettext("could not create ZFS clone " "%s: out of memory\n"), zonepath); return (Z_ERR); @@ -988,8 +987,7 @@ create_zfs_zonepath(char *zonepath) "off") != 0) || (nvlist_add_string(props, zfs_prop_to_name(ZFS_PROP_SHARESMB), "off") != 0)) { - if (props != NULL) - nvlist_free(props); + nvlist_free(props); (void) fprintf(stderr, gettext("cannot create ZFS dataset %s: " "out of memory\n"), zfs_name); } -- cgit v1.2.3