NEX-5665 SMB2 oplock leases
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
NEX-5665 SMB2 oplock leases
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Roman Strashkin <roman.strashkin@nexenta.com>
NEX-4083 Upstream changes from illumos 5917 and 5995
Reviewed by: Matt Barden <matt.barden@nexenta.com>
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>

@@ -19,10 +19,11 @@
  * CDDL HEADER END
  */
 
 /*
  * Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2017 Nexenta Systems, Inc.  All rights reserved.
  */
 
 #ifndef _SYS_SUNDDI_H
 #define _SYS_SUNDDI_H
 

@@ -99,24 +100,12 @@
 extern int ddi_strtol(const char *, char **, int, long *);
 extern int ddi_strtoul(const char *, char **, int, unsigned long *);
 extern int ddi_strtoll(const char *, char **, int, longlong_t *);
 extern int ddi_strtoull(const char *, char **, int, u_longlong_t *);
 
-/*
- * kiconv functions and their macros.
- */
-#define KICONV_IGNORE_NULL      (0x0001)
-#define KICONV_REPLACE_INVALID  (0x0002)
+#endif  /* _KERNEL || _FAKE_KERNEL */
 
-extern kiconv_t kiconv_open(const char *, const char *);
-extern size_t kiconv(kiconv_t, char **, size_t *, char **, size_t *, int *);
-extern int kiconv_close(kiconv_t);
-extern size_t kiconvstr(const char *, const char *, char *, size_t *, char *,
-        size_t *, int, int *);
-
-#endif  /* _KERNEL */
-
 #ifdef  __cplusplus
 }
 #endif
 
 #endif  /* _SYS_SUNDDI_H */