Attachment #108188 for bug #149014

View | Details | Raw Unified | Return to bug 149014
Collapse All | Expand All

Lines 5-10 Link Here

(-)cddl/compat/opensolaris/include/solaris.h (+3 lines)
5		5
6	#include <sys/ccompile.h>	6	#include <sys/ccompile.h>
7		7
		8	/* GNU libc has its own dirent64 declaration */
		9	#ifndef __GLIBC__
8	#define dirent64 dirent	10	#define dirent64 dirent
		11	#endif
9		12
10	#endif /* !_SOLARIS_H_ */	13	#endif /* !_SOLARIS_H_ */

Lines 67-73 Link Here

(-)cddl/compat/opensolaris/misc/fsshare.c (-2 / +2 lines)
67	* mountpoint specified in the 'skip' argument.	70	* mountpoint specified in the 'skip' argument.
68	*/	71	*/
69	static char *	72	static char *
70	getline(FILE fd, const char skip)	73	xgetline(FILE fd, const char skip)
71	{	74	{
72	static char line[MAXLINESIZE];	75	static char line[MAXLINESIZE];
73	size_t len, skiplen;	76	size_t len, skiplen;
Lines 198-204 Link Here
198		201
199	/* Place big, fat warning at the begining of the file. */	202	/* Place big, fat warning at the begining of the file. */
200	fprintf(newfd, "%s", FILE_HEADER);	203	fprintf(newfd, "%s", FILE_HEADER);
201	while (oldfd != NULL && (line = getline(oldfd, mountpoint)) != NULL)	204	while (oldfd != NULL && (line = xgetline(oldfd, mountpoint)) != NULL)
202	fprintf(newfd, "%s\n", line);	205	fprintf(newfd, "%s\n", line);
203	if (oldfd != NULL && ferror(oldfd) != 0) {	206	if (oldfd != NULL && ferror(oldfd) != 0) {
204	error = ferror(oldfd);	207	error = ferror(oldfd);

Lines 63-69 Link Here

(-)cddl/compat/opensolaris/misc/mnttab.c (-1 / +1 lines)
63	}	63	}
64		64
65	char *	65	char *
66	hasmntopt(struct mnttab mnt, char opt)	66	solaris_hasmntopt(struct mnttab mnt, char opt)
67	{	67	{
68	char tmpopts[MNT_LINE_MAX];	68	char tmpopts[MNT_LINE_MAX];
69	char f, opts = tmpopts;	69	char f, opts = tmpopts;

Lines 2166-2176 Link Here

(-)cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c (-2 / +2 lines)
2166	case ZFS_PROP_NBMAND:	2166	case ZFS_PROP_NBMAND:
2167	*val = getprop_uint64(zhp, prop, source);	2167	*val = getprop_uint64(zhp, prop, source);
2168		2168
2169	if (hasmntopt(&mnt, mntopt_on) && !*val) {	2169	if (solaris_hasmntopt(&mnt, mntopt_on) && !*val) {
2170	*val = B_TRUE;	2170	*val = B_TRUE;
2171	if (src)	2171	if (src)
2172	*src = ZPROP_SRC_TEMPORARY;	2172	*src = ZPROP_SRC_TEMPORARY;
2173	} else if (hasmntopt(&mnt, mntopt_off) && *val) {	2173	} else if (solaris_hasmntopt(&mnt, mntopt_off) && *val) {
2174	*val = B_FALSE;	2174	*val = B_FALSE;
2175	if (src)	2175	if (src)
2176	*src = ZPROP_SRC_TEMPORARY;	2176	*src = ZPROP_SRC_TEMPORARY;

Lines 463-469 Link Here

(-)cddl/contrib/opensolaris/lib/libzpool/common/kernel.c (-1 / +1 lines)
463	/ARGSUSED/	463	/ARGSUSED/
464	int	464	int
465	vn_rdwr(int uio, vnode_t vp, void addr, ssize_t len, offset_t offset,	465	vn_rdwr(int uio, vnode_t vp, void addr, ssize_t len, offset_t offset,
466	int x1, int x2, rlim64_t x3, void x4, ssize_t residp)	466	int x1, int x2, solaris_rlim64_t x3, void x4, ssize_t residp)
467	{	467	{
468	ssize_t iolen, split;	468	ssize_t iolen, split;
469		469

Lines 105-112 Link Here

(-)cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h (-3 / +3 lines)
105		105
106	#define ZFS_LOG(...) do { } while (0)	106	#define ZFS_LOG(...) do { } while (0)
107		107
108	typedef u_longlong_t rlim64_t;	108	typedef u_longlong_t solaris_rlim64_t;
109	#define RLIM64_INFINITY ((rlim64_t)-3)	109	#define RLIM64_INFINITY ((solaris_rlim64_t)-3)
110		110
111	#ifdef ZFS_DEBUG	111	#ifdef ZFS_DEBUG
112	extern void dprintf_setup(int argc, char *argv);	112	extern void dprintf_setup(int argc, char *argv);
Lines 438-444 Link Here
438	extern int vn_openat(char path, int x1, int oflags, int mode, vnode_t *vpp,	438	extern int vn_openat(char path, int x1, int oflags, int mode, vnode_t *vpp,
439	int x2, int x3, vnode_t *vp, int fd);	439	int x2, int x3, vnode_t *vp, int fd);
440	extern int vn_rdwr(int uio, vnode_t vp, void addr, ssize_t len,	440	extern int vn_rdwr(int uio, vnode_t vp, void addr, ssize_t len,
441	offset_t offset, int x1, int x2, rlim64_t x3, void x4, ssize_t residp);	441	offset_t offset, int x1, int x2, solaris_rlim64_t x3, void x4, ssize_t residp);
442	extern void vn_close(vnode_t vp, int openflag, cred_t cr, kthread_t *td);	442	extern void vn_close(vnode_t vp, int openflag, cred_t cr, kthread_t *td);
443		443
444	#define vn_remove(path, x1, x2) remove(path)	444	#define vn_remove(path, x1, x2) remove(path)

Lines 32-38 Link Here

(-)sys/cddl/compat/opensolaris/sys/dirent.h (+3 lines)
32	#include_next <sys/dirent.h>	32	#include_next <sys/dirent.h>
33		33
34	typedef struct dirent dirent64_t;	34	typedef struct dirent dirent64_t;
		35	/* GNU libc has its own dirent64 declaration */
		36	#ifndef __GLIBC__
35	#define dirent64 dirent	37	#define dirent64 dirent
		38	#endif
36	#define ino64_t ino_t	39	#define ino64_t ino_t
37		40
38	#define d_ino d_fileno	41	#define d_ino d_fileno

Lines 677-683 Link Here

(-)sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c (-1 / +1 lines)
677	zfs_write(vnode_t vp, uio_t uio, int ioflag, cred_t cr, caller_context_t ct)	677	zfs_write(vnode_t vp, uio_t uio, int ioflag, cred_t cr, caller_context_t ct)
678	{	678	{
679	znode_t *zp = VTOZ(vp);	679	znode_t *zp = VTOZ(vp);
680	rlim64_t limit = MAXOFFSET_T;	680	solaris_rlim64_t limit = MAXOFFSET_T;
681	ssize_t start_resid = uio->uio_resid;	681	ssize_t start_resid = uio->uio_resid;
682	ssize_t tx_bytes;	682	ssize_t tx_bytes;
683	uint64_t end_size;	683	uint64_t end_size;

Return to bug 149014