[Glibc-bsd-commits] r5138 - in trunk/zfsutils/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sat Nov 9 14:25:06 UTC 2013
Author: rmh
Date: 2013-11-09 14:25:05 +0000 (Sat, 09 Nov 2013)
New Revision: 5138
Added:
trunk/zfsutils/debian/patches/compat_opensolaris.diff
trunk/zfsutils/debian/patches/solaris_rlim64_t.diff
trunk/zfsutils/debian/patches/ulong_t.diff
Removed:
trunk/zfsutils/debian/patches/02_glibc_misc.diff
trunk/zfsutils/debian/patches/03_glibc_namespace.diff
trunk/zfsutils/debian/patches/06_mountd.diff
trunk/zfsutils/debian/patches/09_xdr_control.diff
trunk/zfsutils/debian/patches/13_mnttab.diff
trunk/zfsutils/debian/patches/16-wrap-cdefs.diff
trunk/zfsutils/debian/patches/include_next.diff
Modified:
trunk/zfsutils/debian/changelog
trunk/zfsutils/debian/patches/series
Log:
Lump cddl/compat/opensolaris patches together into a single patch.
Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog 2013-11-09 12:52:55 UTC (rev 5137)
+++ trunk/zfsutils/debian/changelog 2013-11-09 14:25:05 UTC (rev 5138)
@@ -1,3 +1,9 @@
+zfsutils (9.2-3) UNRELEASED; urgency=low
+
+ * Lump cddl/compat/opensolaris patches together into a single patch.
+
+ -- Robert Millan <rmh at debian.org> Sat, 09 Nov 2013 14:51:06 +0100
+
zfsutils (9.2-2) unstable; urgency=low
* Disable dependency on libjail (by means of MK_JAIL knob, see
Deleted: trunk/zfsutils/debian/patches/02_glibc_misc.diff
===================================================================
--- trunk/zfsutils/debian/patches/02_glibc_misc.diff 2013-11-09 12:52:55 UTC (rev 5137)
+++ trunk/zfsutils/debian/patches/02_glibc_misc.diff 2013-11-09 14:25:05 UTC (rev 5138)
@@ -1,28 +0,0 @@
---- a/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
-+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
-@@ -380,7 +380,7 @@
- * High order bit is 31 (or 63 in _LP64 kernel).
- */
- static __inline int
--highbit(ulong_t i)
-+highbit(unsigned long i)
- {
- register int h = 1;
-
---- a/sys/cddl/compat/opensolaris/sys/stat.h
-+++ b/sys/cddl/compat/opensolaris/sys/stat.h
-@@ -32,11 +32,13 @@
-
- #include_next <sys/stat.h>
-
-+#ifndef __GLIBC__
- #define stat64 stat
-+#endif
-
- #define MAXOFFSET_T OFF_MAX
-
--#ifndef _KERNEL
-+#if !defined(_KERNEL) && !defined(__GLIBC__)
- #include <sys/disk.h>
-
- static __inline int
Deleted: trunk/zfsutils/debian/patches/03_glibc_namespace.diff
===================================================================
--- trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2013-11-09 12:52:55 UTC (rev 5137)
+++ trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2013-11-09 14:25:05 UTC (rev 5138)
@@ -1,88 +0,0 @@
---- a/cddl/compat/opensolaris/misc/fsshare.c
-+++ b/cddl/compat/opensolaris/misc/fsshare.c
-@@ -69,7 +69,7 @@
- * mountpoint specified in the 'skip' argument.
- */
- static char *
--getline(FILE *fd, const char *skip)
-+xgetline(FILE *fd, const char *skip)
- {
- static char line[MAXLINESIZE];
- size_t len, skiplen;
-@@ -200,7 +200,7 @@
-
- /* Place big, fat warning at the begining of the file. */
- fprintf(newfd, "%s", FILE_HEADER);
-- while (oldfd != NULL && (line = getline(oldfd, mountpoint)) != NULL)
-+ while (oldfd != NULL && (line = xgetline(oldfd, mountpoint)) != NULL)
- fprintf(newfd, "%s\n", line);
- if (oldfd != NULL && ferror(oldfd) != 0) {
- error = ferror(oldfd);
---- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
-+++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
-@@ -467,7 +467,7 @@
- /*ARGSUSED*/
- int
- vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
-- int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp)
-+ int x1, int x2, solaris_rlim64_t x3, void *x4, ssize_t *residp)
- {
- ssize_t iolen, split;
-
---- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
-+++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
-@@ -113,8 +113,8 @@
-
- #define ZFS_LOG(...) do { } while (0)
-
--typedef u_longlong_t rlim64_t;
--#define RLIM64_INFINITY ((rlim64_t)-3)
-+typedef u_longlong_t solaris_rlim64_t;
-+#define RLIM64_INFINITY ((solaris_rlim64_t)-3)
-
- #ifdef ZFS_DEBUG
- extern void dprintf_setup(int *argc, char **argv);
-@@ -498,7 +498,7 @@
- extern int vn_openat(char *path, int x1, int oflags, int mode, vnode_t **vpp,
- int x2, int x3, vnode_t *vp, int fd);
- extern int vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len,
-- offset_t offset, int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp);
-+ offset_t offset, int x1, int x2, solaris_rlim64_t x3, void *x4, ssize_t *residp);
- extern void vn_close(vnode_t *vp, int openflag, cred_t *cr, kthread_t *td);
-
- #define vn_remove(path, x1, x2) remove(path)
---- a/sys/cddl/compat/opensolaris/sys/dirent.h
-+++ b/sys/cddl/compat/opensolaris/sys/dirent.h
-@@ -36,7 +36,10 @@
- typedef struct dirent dirent64_t;
- typedef ino_t ino64_t;
-
-+/* GNU libc has its own dirent64 declaration */
-+#ifndef __GLIBC__
- #define dirent64 dirent
-+#endif
-
- #define d_ino d_fileno
-
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
-@@ -794,7 +794,7 @@
- zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
- {
- znode_t *zp = VTOZ(vp);
-- rlim64_t limit = MAXOFFSET_T;
-+ solaris_rlim64_t limit = MAXOFFSET_T;
- ssize_t start_resid = uio->uio_resid;
- ssize_t tx_bytes;
- uint64_t end_size;
---- a/cddl/compat/opensolaris/include/mnttab.h
-+++ b/cddl/compat/opensolaris/include/mnttab.h
-@@ -28,6 +28,8 @@
-
- int getmntany(FILE *fd, struct mnttab *mgetp, struct mnttab *mrefp);
- int getmntent(FILE *fp, struct mnttab *mp);
-+
-+#define hasmntopt solaris_hasmntopt
- char *hasmntopt(struct mnttab *mnt, char *opt);
-
- void statfs2mnttab(struct statfs *sfs, struct mnttab *mp);
Deleted: trunk/zfsutils/debian/patches/06_mountd.diff
===================================================================
--- trunk/zfsutils/debian/patches/06_mountd.diff 2013-11-09 12:52:55 UTC (rev 5137)
+++ trunk/zfsutils/debian/patches/06_mountd.diff 2013-11-09 14:25:05 UTC (rev 5138)
@@ -1,32 +0,0 @@
----
- cddl/compat/opensolaris/misc/fsshare.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/cddl/compat/opensolaris/misc/fsshare.c
-+++ b/cddl/compat/opensolaris/misc/fsshare.c
-@@ -34,7 +34,6 @@
- #include <fcntl.h>
- #include <fsshare.h>
- #include <libutil.h>
--#include <pathnames.h> /* _PATH_MOUNTDPID */
- #include <signal.h>
- #include <stdio.h>
- #include <string.h>
-@@ -47,6 +46,9 @@
- static void
- restart_mountd(void)
- {
-+ fprintf (stderr, "warning: mountd isn't supported in "
-+ "Debian GNU/kFreeBSD yet\n");
-+#if 0
- struct pidfh *pfh;
- pid_t mountdpid;
-
-@@ -62,6 +64,7 @@
- }
- /* We have mountd(8) PID in mountdpid varible. */
- kill(mountdpid, SIGHUP);
-+#endif
- }
-
- /*
Deleted: trunk/zfsutils/debian/patches/09_xdr_control.diff
===================================================================
--- trunk/zfsutils/debian/patches/09_xdr_control.diff 2013-11-09 12:52:55 UTC (rev 5137)
+++ trunk/zfsutils/debian/patches/09_xdr_control.diff 2013-11-09 14:25:05 UTC (rev 5138)
@@ -1,19 +0,0 @@
---- a/sys/cddl/compat/opensolaris/rpc/xdr.h
-+++ b/sys/cddl/compat/opensolaris/rpc/xdr.h
-@@ -60,10 +60,16 @@
- }
-
- #undef XDR_CONTROL
-+#ifdef __GLIBC__
-+#define XDR_CONTROL(xdrs, req, op) \
-+ (xdrmem_control((xdrs), (req), (op)))
-+
-+#else
- #define XDR_CONTROL(xdrs, req, op) \
- (((xdrs)->x_ops->x_control == NULL) ? \
- xdrmem_control((xdrs), (req), (op)) : \
- (*(xdrs)->x_ops->x_control)(xdrs, req, op))
-+#endif
-
- #endif /* !_KERNEL */
-
Deleted: trunk/zfsutils/debian/patches/13_mnttab.diff
===================================================================
--- trunk/zfsutils/debian/patches/13_mnttab.diff 2013-11-09 12:52:55 UTC (rev 5137)
+++ trunk/zfsutils/debian/patches/13_mnttab.diff 2013-11-09 14:25:05 UTC (rev 5138)
@@ -1,15 +0,0 @@
----
- cddl/compat/opensolaris/include/mnttab.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/cddl/compat/opensolaris/include/mnttab.h
-+++ b/cddl/compat/opensolaris/include/mnttab.h
-@@ -9,7 +9,7 @@
- #include <stdio.h>
- #include <paths.h>
-
--#define MNTTAB _PATH_DEVZERO
-+#define MNTTAB _PATH_MNTTAB
- #define MNT_LINE_MAX 1024
-
- #define MS_OVERLAY 0x0
Deleted: trunk/zfsutils/debian/patches/16-wrap-cdefs.diff
===================================================================
--- trunk/zfsutils/debian/patches/16-wrap-cdefs.diff 2013-11-09 12:52:55 UTC (rev 5137)
+++ trunk/zfsutils/debian/patches/16-wrap-cdefs.diff 2013-11-09 14:25:05 UTC (rev 5138)
@@ -1,42 +0,0 @@
---- a/sys/cddl/compat/opensolaris/sys/misc.h
-+++ b/sys/cddl/compat/opensolaris/sys/misc.h
-@@ -31,7 +31,11 @@
-
- #include <sys/limits.h>
-
-+#ifndef UID_MAX
-+#define MAXUID UINT_MAX
-+#else
- #define MAXUID UID_MAX
-+#endif
-
- #define SPEC_MAXOFFSET_T OFF_MAX
-
---- a/sys/cddl/compat/opensolaris/sys/vnode.h
-+++ b/sys/cddl/compat/opensolaris/sys/vnode.h
-@@ -116,7 +116,11 @@
- #define va_blksize va_blocksize
- #define va_seq va_gen
-
-+#ifndef OFF_MAX
-+#define MAXOFFSET_T __OFF_MAX
-+#else
- #define MAXOFFSET_T OFF_MAX
-+#endif
- #define EXCL 0
-
- #define ACCESSED (AT_ATIME)
---- a/sys/cddl/compat/opensolaris/sys/stat.h
-+++ b/sys/cddl/compat/opensolaris/sys/stat.h
-@@ -36,7 +36,11 @@
- #define stat64 stat
- #endif
-
-+#ifndef OFF_MAX
-+#define MAXOFFSET_T __OFF_MAX
-+#else
- #define MAXOFFSET_T OFF_MAX
-+#endif
-
- #if !defined(_KERNEL) && !defined(__GLIBC__)
- #include <sys/disk.h>
Copied: trunk/zfsutils/debian/patches/compat_opensolaris.diff (from rev 5074, trunk/zfsutils/debian/patches/02_glibc_misc.diff)
===================================================================
--- trunk/zfsutils/debian/patches/compat_opensolaris.diff (rev 0)
+++ trunk/zfsutils/debian/patches/compat_opensolaris.diff 2013-11-09 14:25:05 UTC (rev 5138)
@@ -0,0 +1,208 @@
+--- a/sys/cddl/compat/opensolaris/sys/param.h
++++ b/sys/cddl/compat/opensolaris/sys/param.h
+@@ -27,11 +27,11 @@
+ *
+ */
+
++#include_next <sys/param.h>
++
+ #ifndef _COMPAT_OPENSOLARIS_SYS_PARAM_H_
+ #define _COMPAT_OPENSOLARIS_SYS_PARAM_H_
+
+-#include_next <sys/param.h>
+-
+ #define PAGESIZE PAGE_SIZE
+
+ #ifdef _KERNEL
+--- a/cddl/compat/opensolaris/include/stdio.h
++++ b/cddl/compat/opensolaris/include/stdio.h
+@@ -27,11 +27,11 @@
+ *
+ */
+
++#include_next <stdio.h>
++
+ #ifndef _COMPAT_OPENSOLARIS_STDIO_H_
+ #define _COMPAT_OPENSOLARIS_STDIO_H_
+
+-#include_next <stdio.h>
+-
+ #define ftello64 ftello
+ #define lseek64 lseek
+ #define fseeko64 fseeko
+--- a/cddl/compat/opensolaris/include/stdlib.h
++++ b/cddl/compat/opensolaris/include/stdlib.h
+@@ -27,11 +27,11 @@
+ *
+ */
+
++#include_next <stdlib.h>
++
+ #ifndef _COMPAT_OPENSOLARIS_STDLIB_H_
+ #define _COMPAT_OPENSOLARIS_STDLIB_H_
+
+-#include_next <stdlib.h>
+-
+ #define getexecname getprogname
+
+ #endif
+--- a/cddl/compat/opensolaris/include/alloca.h
++++ b/cddl/compat/opensolaris/include/alloca.h
+@@ -27,6 +27,10 @@
+ *
+ */
+
++#ifdef __GLIBC__
++#include_next <alloca.h>
++#endif
++
+ #ifndef _COMPAT_OPENSOLARIS_ALLOCA_H_
+ #define _COMPAT_OPENSOLARIS_ALLOCA_H_
+
+--- a/sys/cddl/compat/opensolaris/sys/misc.h
++++ b/sys/cddl/compat/opensolaris/sys/misc.h
+@@ -31,7 +31,11 @@
+
+ #include <sys/limits.h>
+
++#ifdef UID_MAX
+ #define MAXUID UID_MAX
++#else
++#define MAXUID UINT_MAX
++#endif
+
+ #define SPEC_MAXOFFSET_T OFF_MAX
+
+--- a/sys/cddl/compat/opensolaris/sys/vnode.h
++++ b/sys/cddl/compat/opensolaris/sys/vnode.h
+@@ -116,7 +116,11 @@
+ #define va_blksize va_blocksize
+ #define va_seq va_gen
+
++#ifndef OFF_MAX
++#define MAXOFFSET_T __OFF_MAX
++#else
+ #define MAXOFFSET_T OFF_MAX
++#endif
+ #define EXCL 0
+
+ #define ACCESSED (AT_ATIME)
+--- a/sys/cddl/compat/opensolaris/sys/stat.h
++++ b/sys/cddl/compat/opensolaris/sys/stat.h
+@@ -32,11 +32,17 @@
+
+ #include_next <sys/stat.h>
+
++#ifndef __GLIBC__
+ #define stat64 stat
++#endif
+
++#ifdef OFF_MAX
+ #define MAXOFFSET_T OFF_MAX
++#else
++#define MAXOFFSET_T __OFF_MAX
++#endif
+
+-#ifndef _KERNEL
++#if !defined(_KERNEL) && !defined(__GLIBC__)
+ #include <sys/disk.h>
+
+ static __inline int
+--- a/cddl/compat/opensolaris/include/mnttab.h
++++ b/cddl/compat/opensolaris/include/mnttab.h
+@@ -9,7 +9,7 @@
+ #include <stdio.h>
+ #include <paths.h>
+
+-#define MNTTAB _PATH_DEVZERO
++#define MNTTAB _PATH_MNTTAB
+ #define MNT_LINE_MAX 1024
+
+ #define MS_OVERLAY 0x0
+@@ -28,6 +28,8 @@
+
+ int getmntany(FILE *fd, struct mnttab *mgetp, struct mnttab *mrefp);
+ int getmntent(FILE *fp, struct mnttab *mp);
++
++#define hasmntopt solaris_hasmntopt
+ char *hasmntopt(struct mnttab *mnt, char *opt);
+
+ void statfs2mnttab(struct statfs *sfs, struct mnttab *mp);
+--- a/sys/cddl/compat/opensolaris/rpc/xdr.h
++++ b/sys/cddl/compat/opensolaris/rpc/xdr.h
+@@ -60,10 +60,16 @@
+ }
+
+ #undef XDR_CONTROL
++#ifdef __GLIBC__
++#define XDR_CONTROL(xdrs, req, op) \
++ (xdrmem_control((xdrs), (req), (op)))
++
++#else
+ #define XDR_CONTROL(xdrs, req, op) \
+ (((xdrs)->x_ops->x_control == NULL) ? \
+ xdrmem_control((xdrs), (req), (op)) : \
+ (*(xdrs)->x_ops->x_control)(xdrs, req, op))
++#endif
+
+ #endif /* !_KERNEL */
+
+--- a/cddl/compat/opensolaris/misc/fsshare.c
++++ b/cddl/compat/opensolaris/misc/fsshare.c
+@@ -34,7 +34,6 @@
+ #include <fcntl.h>
+ #include <fsshare.h>
+ #include <libutil.h>
+-#include <pathnames.h> /* _PATH_MOUNTDPID */
+ #include <signal.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -47,6 +46,9 @@
+ static void
+ restart_mountd(void)
+ {
++ fprintf (stderr, "warning: mountd isn't supported in "
++ "Debian GNU/kFreeBSD yet\n");
++#if 0
+ struct pidfh *pfh;
+ pid_t mountdpid;
+
+@@ -62,6 +64,7 @@
+ }
+ /* We have mountd(8) PID in mountdpid varible. */
+ kill(mountdpid, SIGHUP);
++#endif
+ }
+
+ /*
+@@ -69,7 +72,7 @@
+ * mountpoint specified in the 'skip' argument.
+ */
+ static char *
+-getline(FILE *fd, const char *skip)
++xgetline(FILE *fd, const char *skip)
+ {
+ static char line[MAXLINESIZE];
+ size_t len, skiplen;
+@@ -200,7 +203,7 @@
+
+ /* Place big, fat warning at the begining of the file. */
+ fprintf(newfd, "%s", FILE_HEADER);
+- while (oldfd != NULL && (line = getline(oldfd, mountpoint)) != NULL)
++ while (oldfd != NULL && (line = xgetline(oldfd, mountpoint)) != NULL)
+ fprintf(newfd, "%s\n", line);
+ if (oldfd != NULL && ferror(oldfd) != 0) {
+ error = ferror(oldfd);
+--- a/sys/cddl/compat/opensolaris/sys/dirent.h
++++ b/sys/cddl/compat/opensolaris/sys/dirent.h
+@@ -36,7 +36,10 @@
+ typedef struct dirent dirent64_t;
+ typedef ino_t ino64_t;
+
++/* GNU libc has its own dirent64 declaration */
++#ifndef __GLIBC__
+ #define dirent64 dirent
++#endif
+
+ #define d_ino d_fileno
+
Deleted: trunk/zfsutils/debian/patches/include_next.diff
===================================================================
--- trunk/zfsutils/debian/patches/include_next.diff 2013-11-09 12:52:55 UTC (rev 5137)
+++ trunk/zfsutils/debian/patches/include_next.diff 2013-11-09 14:25:05 UTC (rev 5138)
@@ -1,61 +0,0 @@
---- a/sys/cddl/compat/opensolaris/sys/param.h
-+++ b/sys/cddl/compat/opensolaris/sys/param.h
-@@ -27,11 +27,11 @@
- *
- */
-
-+#include_next <sys/param.h>
-+
- #ifndef _COMPAT_OPENSOLARIS_SYS_PARAM_H_
- #define _COMPAT_OPENSOLARIS_SYS_PARAM_H_
-
--#include_next <sys/param.h>
--
- #define PAGESIZE PAGE_SIZE
-
- #ifdef _KERNEL
---- a/cddl/compat/opensolaris/include/stdio.h
-+++ b/cddl/compat/opensolaris/include/stdio.h
-@@ -27,11 +27,11 @@
- *
- */
-
-+#include_next <stdio.h>
-+
- #ifndef _COMPAT_OPENSOLARIS_STDIO_H_
- #define _COMPAT_OPENSOLARIS_STDIO_H_
-
--#include_next <stdio.h>
--
- #define ftello64 ftello
- #define lseek64 lseek
- #define fseeko64 fseeko
---- a/cddl/compat/opensolaris/include/stdlib.h
-+++ b/cddl/compat/opensolaris/include/stdlib.h
-@@ -27,11 +27,11 @@
- *
- */
-
-+#include_next <stdlib.h>
-+
- #ifndef _COMPAT_OPENSOLARIS_STDLIB_H_
- #define _COMPAT_OPENSOLARIS_STDLIB_H_
-
--#include_next <stdlib.h>
--
- #define getexecname getprogname
-
- #endif
---- a/cddl/compat/opensolaris/include/alloca.h
-+++ b/cddl/compat/opensolaris/include/alloca.h
-@@ -27,6 +27,10 @@
- *
- */
-
-+#ifdef __GLIBC__
-+#include_next <alloca.h>
-+#endif
-+
- #ifndef _COMPAT_OPENSOLARIS_ALLOCA_H_
- #define _COMPAT_OPENSOLARIS_ALLOCA_H_
-
Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series 2013-11-09 12:52:55 UTC (rev 5137)
+++ trunk/zfsutils/debian/patches/series 2013-11-09 14:25:05 UTC (rev 5138)
@@ -4,21 +4,17 @@
zfs_needs_libjail.diff
# Mergeable material
+compat_opensolaris.diff
disable_libjail.diff
gratuitous_dependencies.diff
#manpage_hyphens.diff
-include_next.diff
assfail_protection.diff
# Other patches that might or might not be mergeable
-02_glibc_misc.diff
-03_glibc_namespace.diff
-06_mountd.diff
-09_xdr_control.diff
-13_mnttab.diff
+ulong_t.diff
+solaris_rlim64_t.diff
14_bootloader_advice.diff
15_pthread_compat.diff
-16-wrap-cdefs.diff
# Patches that are likely to be Debian-specific
makefile.diff
Copied: trunk/zfsutils/debian/patches/solaris_rlim64_t.diff (from rev 5074, trunk/zfsutils/debian/patches/03_glibc_namespace.diff)
===================================================================
--- trunk/zfsutils/debian/patches/solaris_rlim64_t.diff (rev 0)
+++ trunk/zfsutils/debian/patches/solaris_rlim64_t.diff 2013-11-09 14:25:05 UTC (rev 5138)
@@ -0,0 +1,44 @@
+--- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
++++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
+@@ -467,7 +467,7 @@
+ /*ARGSUSED*/
+ int
+ vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
+- int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp)
++ int x1, int x2, solaris_rlim64_t x3, void *x4, ssize_t *residp)
+ {
+ ssize_t iolen, split;
+
+--- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
++++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
+@@ -113,8 +113,8 @@
+
+ #define ZFS_LOG(...) do { } while (0)
+
+-typedef u_longlong_t rlim64_t;
+-#define RLIM64_INFINITY ((rlim64_t)-3)
++typedef u_longlong_t solaris_rlim64_t;
++#define RLIM64_INFINITY ((solaris_rlim64_t)-3)
+
+ #ifdef ZFS_DEBUG
+ extern void dprintf_setup(int *argc, char **argv);
+@@ -498,7 +498,7 @@
+ extern int vn_openat(char *path, int x1, int oflags, int mode, vnode_t **vpp,
+ int x2, int x3, vnode_t *vp, int fd);
+ extern int vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len,
+- offset_t offset, int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp);
++ offset_t offset, int x1, int x2, solaris_rlim64_t x3, void *x4, ssize_t *residp);
+ extern void vn_close(vnode_t *vp, int openflag, cred_t *cr, kthread_t *td);
+
+ #define vn_remove(path, x1, x2) remove(path)
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+@@ -794,7 +794,7 @@
+ zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
+ {
+ znode_t *zp = VTOZ(vp);
+- rlim64_t limit = MAXOFFSET_T;
++ solaris_rlim64_t limit = MAXOFFSET_T;
+ ssize_t start_resid = uio->uio_resid;
+ ssize_t tx_bytes;
+ uint64_t end_size;
Copied: trunk/zfsutils/debian/patches/ulong_t.diff (from rev 5074, trunk/zfsutils/debian/patches/02_glibc_misc.diff)
===================================================================
--- trunk/zfsutils/debian/patches/ulong_t.diff (rev 0)
+++ trunk/zfsutils/debian/patches/ulong_t.diff 2013-11-09 14:25:05 UTC (rev 5138)
@@ -0,0 +1,11 @@
+--- a/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
++++ b/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
+@@ -380,7 +380,7 @@
+ * High order bit is 31 (or 63 in _LP64 kernel).
+ */
+ static __inline int
+-highbit(ulong_t i)
++highbit(unsigned long i)
+ {
+ register int h = 1;
+
More information about the Glibc-bsd-commits
mailing list