diff options
| author | mav <mav@FreeBSD.org> | 2016-03-21 00:22:09 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2016-03-21 00:22:09 +0000 |
| commit | 18f23d78714536c48ef5b0c0792d423102325ee4 (patch) | |
| tree | 5ecfd5f7e1b82c915384303cd8e5bfad5f721c04 /cddl/contrib/opensolaris/cmd/zfs | |
| parent | e34c027e2e21bb8122b138bc26bcc6099ef0f26a (diff) | |
| download | FreeBSD-src-18f23d78714536c48ef5b0c0792d423102325ee4.zip FreeBSD-src-18f23d78714536c48ef5b0c0792d423102325ee4.tar.gz | |
MFC r296528: MFV r296527: 6659 nvlist_free(NULL) is a no-op
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by: Robert Mustacchi <rm@joyent.com>
Author: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
illumos/illumos-gate@aab83bb83be7342f6cfccaed8d5fe0b2f404855d
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/zfs')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zfs/zfs_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c index fd1e939..3739d5b 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c @@ -5407,8 +5407,7 @@ zfs_do_allow_unallow_impl(int argc, char **argv, boolean_t un) cleanup0: nvlist_free(perm_nvl); - if (update_perm_nvl != NULL) - nvlist_free(update_perm_nvl); + nvlist_free(update_perm_nvl); cleanup1: fs_perm_set_fini(&fs_perm_set); cleanup2: |
