diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-07-24 11:41:26 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-07-24 11:41:26 +0000 |
| commit | 5b6d8a45d43cad27424fe3742fc5420e5e621038 (patch) | |
| tree | e1a25d0e0f573bbaec69d67dac9a6b3c96224afc /usr/src/lib/libnvpair | |
| parent | c67976a7d0f48374dab986535bad445ffb728e00 (diff) | |
| parent | 2ec7644aab2a726a64681fa66c6db8731b160de1 (diff) | |
| download | illumos-joyent-5b6d8a45d43cad27424fe3742fc5420e5e621038.tar.gz | |
[illumos-gate merge]
commit 2ec7644aab2a726a64681fa66c6db8731b160de1
9580 Add a hash-table on top of nvlist to speed-up operations
commit abe1fd01ce5a83718c5a840daeab4abdaec1c104
9465 ARC check for 'anon_size > arc_c/2' can stall the system
Diffstat (limited to 'usr/src/lib/libnvpair')
| -rw-r--r-- | usr/src/lib/libnvpair/nvpair_json.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/lib/libnvpair/nvpair_json.c b/usr/src/lib/libnvpair/nvpair_json.c index 7ebd1be7a0..3205d229ab 100644 --- a/usr/src/lib/libnvpair/nvpair_json.c +++ b/usr/src/lib/libnvpair/nvpair_json.c @@ -10,6 +10,7 @@ */ /* * Copyright (c) 2014, Joyent, Inc. + * Copyright (c) 2017 by Delphix. All rights reserved. */ #include <stdio.h> @@ -461,8 +462,10 @@ nvlist_do_json(nvlist_t *nvl, char **bufp, size_t *blen, off_t *offp) } case DATA_TYPE_UNKNOWN: + case DATA_TYPE_DONTCARE: return (-1); } + } FPRINTF(bufp, blen, offp, "}"); |