Print this page
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>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/lib/smbsrv/libfksmbsrv/common/sys/sunddi.h
+++ new/usr/src/lib/smbsrv/libfksmbsrv/common/sys/sunddi.h
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
|
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 */
21 21
22 22 /*
23 23 * Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
24 + * Copyright 2017 Nexenta Systems, Inc. All rights reserved.
24 25 */
25 26
26 27 #ifndef _SYS_SUNDDI_H
27 28 #define _SYS_SUNDDI_H
28 29
29 30 /*
30 31 * Sun Specific DDI definitions (fakekernel version)
31 32 * The real sunddi.h has become a "kitchen sink" full of
32 33 * includes we don't want, and lots of places include it.
33 34 * Rather than fight that battle now, provide this one
34 35 * with just the str*, mem*, and kiconv* functions.
35 36 * Some day, re-factor: sunddi.h, systm.h
36 37 */
37 38
38 39 #include <sys/isa_defs.h>
39 40 #include <sys/dditypes.h>
40 41 #include <sys/time.h>
41 42 #include <sys/cmn_err.h>
42 43
43 44 #include <sys/kmem.h>
44 45 #include <sys/nvpair.h>
45 46 #include <sys/thread.h>
46 47 #include <sys/stream.h>
47 48
48 49 #include <sys/u8_textprep.h>
49 50 #include <sys/kiconv.h>
50 51
51 52 #ifdef __cplusplus
52 53 extern "C" {
53 54 #endif
54 55
55 56 #if defined(_KERNEL) || defined(_FAKE_KERNEL)
56 57
57 58 extern char *ddi_strdup(const char *str, int flag);
58 59 extern char *strdup(const char *str);
59 60 extern void strfree(char *str);
60 61
61 62 extern size_t strlen(const char *) __PURE;
62 63 extern size_t strnlen(const char *, size_t) __PURE;
63 64 extern char *strcpy(char *, const char *);
64 65 extern char *strncpy(char *, const char *, size_t);
65 66
66 67 /* Need to be consistent with <string.h> C++ definition for strchr() */
67 68 #if __cplusplus >= 199711L
68 69 extern const char *strchr(const char *, int);
69 70 #else
70 71 extern char *strchr(const char *, int);
71 72 #endif /* __cplusplus >= 199711L */
72 73
73 74 #define DDI_STRSAME(s1, s2) ((*(s1) == *(s2)) && (strcmp((s1), (s2)) == 0))
74 75 extern int strcmp(const char *, const char *) __PURE;
75 76 extern int strncmp(const char *, const char *, size_t) __PURE;
76 77 extern char *strncat(char *, const char *, size_t);
77 78 extern size_t strlcat(char *, const char *, size_t);
78 79 extern size_t strlcpy(char *, const char *, size_t);
79 80 extern size_t strspn(const char *, const char *);
80 81 extern size_t strcspn(const char *, const char *);
81 82 extern int bcmp(const void *, const void *, size_t) __PURE;
82 83 extern int stoi(char **);
83 84 extern void numtos(ulong_t, char *);
84 85 extern void bcopy(const void *, void *, size_t);
85 86 extern void bzero(void *, size_t);
86 87
87 88 extern void *memcpy(void *, const void *, size_t);
88 89 extern void *memset(void *, int, size_t);
89 90 extern void *memmove(void *, const void *, size_t);
90 91 extern int memcmp(const void *, const void *, size_t) __PURE;
91 92
92 93 /* Need to be consistent with <string.h> C++ definition for memchr() */
93 94 #if __cplusplus >= 199711L
|
↓ open down ↓ |
60 lines elided |
↑ open up ↑ |
94 95 extern const void *memchr(const void *, int, size_t);
95 96 #else
96 97 extern void *memchr(const void *, int, size_t);
97 98 #endif /* __cplusplus >= 199711L */
98 99
99 100 extern int ddi_strtol(const char *, char **, int, long *);
100 101 extern int ddi_strtoul(const char *, char **, int, unsigned long *);
101 102 extern int ddi_strtoll(const char *, char **, int, longlong_t *);
102 103 extern int ddi_strtoull(const char *, char **, int, u_longlong_t *);
103 104
104 -/*
105 - * kiconv functions and their macros.
106 - */
107 -#define KICONV_IGNORE_NULL (0x0001)
108 -#define KICONV_REPLACE_INVALID (0x0002)
105 +#endif /* _KERNEL || _FAKE_KERNEL */
109 106
110 -extern kiconv_t kiconv_open(const char *, const char *);
111 -extern size_t kiconv(kiconv_t, char **, size_t *, char **, size_t *, int *);
112 -extern int kiconv_close(kiconv_t);
113 -extern size_t kiconvstr(const char *, const char *, char *, size_t *, char *,
114 - size_t *, int, int *);
115 -
116 -#endif /* _KERNEL */
117 -
118 107 #ifdef __cplusplus
119 108 }
120 109 #endif
121 110
122 111 #endif /* _SYS_SUNDDI_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX