diff options
| author | Andrew Stormont <astormont@racktopsystems.com> | 2018-10-25 17:16:39 +0100 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2018-12-10 11:00:16 -0500 |
| commit | b8a5bee186f188738b6a8f63ebf28331543ae32e (patch) | |
| tree | df4b6ff08469c7e80c03f841fbae23d34ad6dfc3 /usr | |
| parent | 16d8656330ae5622ec32e5007f62145ebafdc50f (diff) | |
| download | illumos-gate-b8a5bee186f188738b6a8f63ebf28331543ae32e.tar.gz | |
9914 NV_UNIQUE_NAME_TYPE broken after 9580
Reviewed by: Yuri Pankov <yuripv@yuripv.net>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/common/nvpair/nvpair.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/common/nvpair/nvpair.c b/usr/src/common/nvpair/nvpair.c index bffae68ca3..0e1ec15d61 100644 --- a/usr/src/common/nvpair/nvpair.c +++ b/usr/src/common/nvpair/nvpair.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 2017 by Delphix. All rights reserved. + * Copyright 2018 RackTop Systems. */ #include <sys/stropts.h> @@ -475,7 +476,7 @@ nvt_remove_nvpair(nvlist_t *nvl, nvpair_t *nvp) for (i_nvp_t *prev = NULL, *e = bucket; e != NULL; prev = e, e = e->nvi_hashtable_next) { - if (nvt_nvpair_match(&e->nvi_nvp, nvp, nvl->nvl_flag)) { + if (nvt_nvpair_match(&e->nvi_nvp, nvp, nvl->nvl_nvflag)) { if (prev != NULL) { prev->nvi_hashtable_next = e->nvi_hashtable_next; |