diff options
| author | Andrew Stormont <[email protected]> | 2018-10-25 17:16:39 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-03-13 11:16:30 -0700 |
| commit | 181424237903cd139df8e63fa6f09ebf2e8cd750 (patch) | |
| tree | 761ad41f9886bbdd6860ef5ea2556c2d852fb1ee | |
| parent | f00ab3f22cc2c7f62cfd56be842945667b1d558f (diff) | |
OpenZFS 9914 - NV_UNIQUE_NAME_TYPE broken after 9580
Authored by: Andrew Stormont <[email protected]>
Reviewed by: Yuri Pankov <[email protected]>
Reviewed by: Garrett D'Amore <[email protected]>
Reviewed by: Andy Fiddaman <[email protected]>
Reviewed-by: Serapheim Dimitropoulos <[email protected]>
Reviewed-by: Igor Kozhukhov <[email protected]>
Approved by: Dan McDonald <[email protected]>
Ported-by: Brian Behlendorf <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/9914
OpenZFS-commit: https://github.com/illumos/illumos-gate/commit/b8a5bee18
Closes #8496
| -rw-r--r-- | module/nvpair/nvpair.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c index 9d1fe4643..251629225 100644 --- a/module/nvpair/nvpair.c +++ b/module/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/debug.h> @@ -470,7 +471,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; |