diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-29 12:17:08 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-29 12:17:08 +0000 |
| commit | 67c3f4c9f70c40ce0dd12db8804e720c3a0c0c79 (patch) | |
| tree | a3220c2c4058a61e04dd53a843726a6dd4266a54 /usr/src/cmd/zoneadm/zfs.c | |
| parent | e5490f12d073ec144d62bc50456b750256cc7c0a (diff) | |
| parent | aab83bb83be7342f6cfccaed8d5fe0b2f404855d (diff) | |
| download | illumos-joyent-67c3f4c9f70c40ce0dd12db8804e720c3a0c0c79.tar.gz | |
[illumos-gate merge]
commit aab83bb83be7342f6cfccaed8d5fe0b2f404855d
6659 nvlist_free(NULL) is a no-op
commit d643a855cbd8c4fb4fe966406fa05dff70673597
6674 sys/isa_defs.h shouldn't unconditionally define _ILP32
commit bcf23f43dc1b73080eeded927585ee86feab40a7
6596 Macro redefined in strtolctype.h
Diffstat (limited to 'usr/src/cmd/zoneadm/zfs.c')
| -rw-r--r-- | usr/src/cmd/zoneadm/zfs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/cmd/zoneadm/zfs.c b/usr/src/cmd/zoneadm/zfs.c index 78c165ffd1..327daec20c 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); @@ -989,8 +988,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); } |