Skip to content
Permalink
Browse files

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>
  • Loading branch information...
andy-js authored and danmcd committed Oct 25, 2018
1 parent 16d8656 commit b8a5bee186f188738b6a8f63ebf28331543ae32e
Showing with 2 additions and 1 deletion.
  1. +2 −1 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;

0 comments on commit b8a5bee

Please sign in to comment.
You can’t perform that action at this time.