| @@ -20,26 +20,28 @@ | | | @@ -20,26 +20,28 @@ |
20 | */ | | 20 | */ |
21 | /* | | 21 | /* |
22 | * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. | | 22 | * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. |
23 | * Copyright (c) 2012 by Delphix. All rights reserved. | | 23 | * Copyright (c) 2012 by Delphix. All rights reserved. |
24 | */ | | 24 | */ |
25 | | | 25 | |
26 | #ifndef _SYS_NVPAIR_H | | 26 | #ifndef _SYS_NVPAIR_H |
27 | #define _SYS_NVPAIR_H | | 27 | #define _SYS_NVPAIR_H |
28 | | | 28 | |
29 | #include <sys/types.h> | | 29 | #include <sys/types.h> |
30 | #include <sys/time.h> | | 30 | #include <sys/time.h> |
31 | #include <sys/errno.h> | | 31 | #include <sys/errno.h> |
32 | | | 32 | |
| | | 33 | #include <sys/nvnamespace.h> |
| | | 34 | |
33 | #if defined(_KERNEL) && !defined(_BOOT) | | 35 | #if defined(_KERNEL) && !defined(_BOOT) |
34 | #include <sys/kmem.h> | | 36 | #include <sys/kmem.h> |
35 | #endif | | 37 | #endif |
36 | | | 38 | |
37 | #ifdef __cplusplus | | 39 | #ifdef __cplusplus |
38 | extern "C" { | | 40 | extern "C" { |
39 | #endif | | 41 | #endif |
40 | | | 42 | |
41 | typedef enum { | | 43 | typedef enum { |
42 | DATA_TYPE_UNKNOWN = 0, | | 44 | DATA_TYPE_UNKNOWN = 0, |
43 | DATA_TYPE_BOOLEAN, | | 45 | DATA_TYPE_BOOLEAN, |
44 | DATA_TYPE_BYTE, | | 46 | DATA_TYPE_BYTE, |
45 | DATA_TYPE_INT16, | | 47 | DATA_TYPE_INT16, |