summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/fs/dev/sdev_subr.c
diff options
context:
space:
mode:
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>2016-02-24 11:58:55 -0500
committerRobert Mustacchi <rm@joyent.com>2016-02-27 08:52:10 -0800
commitaab83bb83be7342f6cfccaed8d5fe0b2f404855d (patch)
tree548e8760643ee94860fb29486fbf965675c52a59 /usr/src/uts/common/fs/dev/sdev_subr.c
parentd643a855cbd8c4fb4fe966406fa05dff70673597 (diff)
downloadillumos-gate-aab83bb83be7342f6cfccaed8d5fe0b2f404855d.tar.gz
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>
Diffstat (limited to 'usr/src/uts/common/fs/dev/sdev_subr.c')
-rw-r--r--usr/src/uts/common/fs/dev/sdev_subr.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/usr/src/uts/common/fs/dev/sdev_subr.c b/usr/src/uts/common/fs/dev/sdev_subr.c
index b4b27e6285..7f8f968454 100644
--- a/usr/src/uts/common/fs/dev/sdev_subr.c
+++ b/usr/src/uts/common/fs/dev/sdev_subr.c
@@ -160,16 +160,11 @@ static void
sdev_prof_free(struct sdev_node *dv)
{
ASSERT(!SDEV_IS_GLOBAL(dv));
- if (dv->sdev_prof.dev_name)
- nvlist_free(dv->sdev_prof.dev_name);
- if (dv->sdev_prof.dev_map)
- nvlist_free(dv->sdev_prof.dev_map);
- if (dv->sdev_prof.dev_symlink)
- nvlist_free(dv->sdev_prof.dev_symlink);
- if (dv->sdev_prof.dev_glob_incdir)
- nvlist_free(dv->sdev_prof.dev_glob_incdir);
- if (dv->sdev_prof.dev_glob_excdir)
- nvlist_free(dv->sdev_prof.dev_glob_excdir);
+ nvlist_free(dv->sdev_prof.dev_name);
+ nvlist_free(dv->sdev_prof.dev_map);
+ nvlist_free(dv->sdev_prof.dev_symlink);
+ nvlist_free(dv->sdev_prof.dev_glob_incdir);
+ nvlist_free(dv->sdev_prof.dev_glob_excdir);
bzero(&dv->sdev_prof, sizeof (dv->sdev_prof));
}