[Glibc-bsd-commits] r6067 - in trunk/zfsutils/debian: . patches
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Thu Jun 9 23:20:53 UTC 2016
Author: stevenc-guest
Date: 2016-06-09 23:20:53 +0000 (Thu, 09 Jun 2016)
New Revision: 6067
Added:
trunk/zfsutils/debian/patches/13_freebsd.diff
trunk/zfsutils/debian/patches/libmd.diff
trunk/zfsutils/debian/patches/noinline.diff
Removed:
trunk/zfsutils/debian/patches/gratuitous_dependencies.diff
Modified:
trunk/zfsutils/debian/changelog
trunk/zfsutils/debian/patches/14_bootloader_advice.diff
trunk/zfsutils/debian/patches/15_pthread_compat.diff
trunk/zfsutils/debian/patches/bug653929.diff
trunk/zfsutils/debian/patches/bug762199.patch
trunk/zfsutils/debian/patches/disable_libjail.diff
trunk/zfsutils/debian/patches/fix_realpath_abuse.diff
trunk/zfsutils/debian/patches/makefile.diff
trunk/zfsutils/debian/patches/series
trunk/zfsutils/debian/patches/solaris_rlim64_t.diff
trunk/zfsutils/debian/patches/ulong_t.diff
Log:
* New upstream snapshot of 10.3-RELEASE
* Remove obsolete patch:
- gratuitous_dependencies.diff
* Refresh patches:
- disable_libjail.diff
- 14_bootloader_advice.diff
- ulong_t.diff
- solaris_rlim64_t.diff
- 15_pthread_compat.diff
- fix_realpath_abuse.diff
- makefile.diff
- bug762199.patch
- bug653929.diff
* New patches:
- 13_freebsd.diff: use __FreeBSD_kernel__ macro as needed
- libmd.diff: use system sha2.h from libmd
- noinline.diff: convert to using __attribute__ keyword
Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog 2016-06-09 22:23:01 UTC (rev 6066)
+++ trunk/zfsutils/debian/changelog 2016-06-09 23:20:53 UTC (rev 6067)
@@ -1,6 +1,23 @@
-zfsutils (10.1~svn272500+ds1-1) UNRELEASED; urgency=medium
+zfsutils (10.3~svn296373-1) UNRELEASED; urgency=medium
[ Steven Chamberlain ]
+ * New upstream snapshot of 10.3-RELEASE
+ * Remove obsolete patch:
+ - gratuitous_dependencies.diff
+ * Refresh patches:
+ - disable_libjail.diff
+ - 14_bootloader_advice.diff
+ - ulong_t.diff
+ - solaris_rlim64_t.diff
+ - 15_pthread_compat.diff
+ - fix_realpath_abuse.diff
+ - makefile.diff
+ - bug762199.patch
+ - bug653929.diff
+ * New patches:
+ - 13_freebsd.diff: use __FreeBSD_kernel__ macro as needed
+ - libmd.diff: use system sha2.h from libmd
+ - noinline.diff: convert to using __attribute__ keyword
* Update svn_revision regex to allow +suffix
* svn export with --ignore-keywords and re-pack upstream source
* Refresh patch debian/patches/disable_libjail.diff
Added: trunk/zfsutils/debian/patches/13_freebsd.diff
===================================================================
--- trunk/zfsutils/debian/patches/13_freebsd.diff (rev 0)
+++ trunk/zfsutils/debian/patches/13_freebsd.diff 2016-06-09 23:20:53 UTC (rev 6067)
@@ -0,0 +1,15 @@
+Date: Fri, 10 Jun 2016 00:14:38 +0100
+From: Steven Chamberlain <steven at pyro.eu.org>
+Subject: use __FreeBSD_kernel__ macro as needed
+
+--- a/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c
++++ b/sys/cddl/contrib/opensolaris/common/nvpair/opensolaris_nvpair.c
+@@ -44,7 +44,7 @@
+ #endif
+ #define skip_whitespace(p) while ((*(p) == ' ') || (*(p) == '\t')) p++
+
+-#if defined(__FreeBSD__) && !defined(_KERNEL)
++#if defined(__FreeBSD_kernel__) && !defined(_KERNEL)
+ /*
+ * libnvpair is the lowest commen denominator for ZFS related libraries,
+ * defining aok here makes it usable by all ZFS related libraries
Modified: trunk/zfsutils/debian/patches/14_bootloader_advice.diff
===================================================================
--- trunk/zfsutils/debian/patches/14_bootloader_advice.diff 2016-06-09 22:23:01 UTC (rev 6066)
+++ trunk/zfsutils/debian/patches/14_bootloader_advice.diff 2016-06-09 23:20:53 UTC (rev 6067)
@@ -1,6 +1,6 @@
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
-@@ -5009,10 +5009,17 @@ zpool_do_upgrade(int argc, char **argv)
+@@ -5124,10 +5124,17 @@
if (cb.cb_poolname[0] != '\0') {
(void) printf(
"If you boot from pool '%s', don't forget to update boot code.\n"
@@ -20,7 +20,7 @@
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
-@@ -2718,11 +2718,18 @@ zpool_vdev_attach(zpool_handle_t *zhp,
+@@ -2676,11 +2676,18 @@
(void) fprintf(stderr, dgettext(TEXT_DOMAIN, "If "
"you boot from pool '%s', you may need to update\n"
"boot code on newly attached disk '%s'.\n\n"
Modified: trunk/zfsutils/debian/patches/15_pthread_compat.diff
===================================================================
--- trunk/zfsutils/debian/patches/15_pthread_compat.diff 2016-06-09 22:23:01 UTC (rev 6066)
+++ trunk/zfsutils/debian/patches/15_pthread_compat.diff 2016-06-09 23:20:53 UTC (rev 6067)
@@ -1,6 +1,6 @@
--- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
-@@ -245,7 +245,28 @@ typedef struct kmutex {
+@@ -255,7 +255,28 @@
#undef MUTEX_NOT_HELD
#define MUTEX_HELD(m) ((m)->m_owner == curthread)
#define MUTEX_NOT_HELD(m) (!MUTEX_HELD(m))
Modified: trunk/zfsutils/debian/patches/bug653929.diff
===================================================================
--- trunk/zfsutils/debian/patches/bug653929.diff 2016-06-09 22:23:01 UTC (rev 6066)
+++ trunk/zfsutils/debian/patches/bug653929.diff 2016-06-09 23:20:53 UTC (rev 6067)
@@ -11,7 +11,7 @@
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
-@@ -3404,7 +3404,7 @@
+@@ -3364,7 +3364,7 @@
{
char *path, *devid;
uint64_t value;
@@ -20,7 +20,7 @@
vdev_stat_t *vs;
uint_t vsc;
int have_stats;
-@@ -3516,9 +3516,9 @@
+@@ -3476,9 +3476,9 @@
verify(nvlist_lookup_uint64(nv, ZPOOL_CONFIG_ID,
&id) == 0);
Modified: trunk/zfsutils/debian/patches/bug762199.patch
===================================================================
--- trunk/zfsutils/debian/patches/bug762199.patch 2016-06-09 22:23:01 UTC (rev 6066)
+++ trunk/zfsutils/debian/patches/bug762199.patch 2016-06-09 23:20:53 UTC (rev 6067)
@@ -5,7 +5,7 @@
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
-@@ -1063,23 +1063,19 @@
+@@ -1069,23 +1069,19 @@
return;
}
/* this file is too small to hold a zpool */
Modified: trunk/zfsutils/debian/patches/disable_libjail.diff
===================================================================
--- trunk/zfsutils/debian/patches/disable_libjail.diff 2016-06-09 22:23:01 UTC (rev 6066)
+++ trunk/zfsutils/debian/patches/disable_libjail.diff 2016-06-09 23:20:53 UTC (rev 6067)
@@ -37,7 +37,7 @@
#include <libzfs.h>
#include <libzfs_core.h>
-@@ -105,8 +107,10 @@
+@@ -106,8 +108,10 @@
static int zfs_do_holds(int argc, char **argv);
static int zfs_do_release(int argc, char **argv);
static int zfs_do_diff(int argc, char **argv);
@@ -48,7 +48,7 @@
static int zfs_do_bookmark(int argc, char **argv);
/*
-@@ -134,8 +138,10 @@
+@@ -135,8 +139,10 @@
HELP_GET,
HELP_INHERIT,
HELP_UPGRADE,
@@ -59,7 +59,7 @@
HELP_LIST,
HELP_MOUNT,
HELP_PROMOTE,
-@@ -211,8 +217,10 @@
+@@ -212,8 +218,10 @@
{ "release", zfs_do_release, HELP_RELEASE },
{ "diff", zfs_do_diff, HELP_DIFF },
{ NULL },
@@ -70,7 +70,7 @@
};
#define NCOMMAND (sizeof (command_table) / sizeof (command_table[0]))
-@@ -248,10 +256,12 @@
+@@ -249,10 +257,12 @@
case HELP_UPGRADE:
return (gettext("\tupgrade [-v]\n"
"\tupgrade [-r] [-V version] <-a | filesystem ...>\n"));
@@ -83,7 +83,7 @@
case HELP_LIST:
return (gettext("\tlist [-Hp] [-r|-d max] [-o property[,...]] "
"[-s property]...\n\t [-S property]... [-t type[,...]] "
-@@ -6480,6 +6490,7 @@
+@@ -6642,6 +6652,7 @@
return (unshare_unmount(OP_SHARE, argc, argv));
}
@@ -91,7 +91,7 @@
/*
* Attach/detach the given dataset to/from the given jail
*/
-@@ -6541,6 +6552,7 @@
+@@ -6703,6 +6714,7 @@
return (do_jail(argc, argv, 0));
}
Modified: trunk/zfsutils/debian/patches/fix_realpath_abuse.diff
===================================================================
--- trunk/zfsutils/debian/patches/fix_realpath_abuse.diff 2016-06-09 22:23:01 UTC (rev 6066)
+++ trunk/zfsutils/debian/patches/fix_realpath_abuse.diff 2016-06-09 23:20:53 UTC (rev 6067)
@@ -3,8 +3,8 @@
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
-@@ -1169,7 +1169,7 @@
- int dfd;
+@@ -1174,7 +1174,7 @@
+ DIR *dirp;
/* use realpath to normalize the path */
- if (realpath(dir[i], path) == 0) {
Deleted: trunk/zfsutils/debian/patches/gratuitous_dependencies.diff
===================================================================
--- trunk/zfsutils/debian/patches/gratuitous_dependencies.diff 2016-06-09 22:23:01 UTC (rev 6066)
+++ trunk/zfsutils/debian/patches/gratuitous_dependencies.diff 2016-06-09 23:20:53 UTC (rev 6067)
@@ -1,22 +0,0 @@
---- a/cddl/lib/libzfs/Makefile
-+++ b/cddl/lib/libzfs/Makefile
-@@ -8,7 +8,7 @@
- LIB= zfs
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- ${LIBAVL} ${LIBZFS_CORE}
--LDADD= -lmd -lpthread -lumem -lutil -lm -lnvpair -lavl -lzfs_core
-+LDADD= -lmd -lpthread -lumem -lutil -lavl -lzfs_core
-
- SRCS= deviceid.c \
- fsshare.c \
---- a/cddl/lib/libzpool/Makefile
-+++ b/cddl/lib/libzpool/Makefile
-@@ -57,7 +57,7 @@
- CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
-
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
--LDADD= -lmd -lpthread -lz
-+LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl
-
- # atomic.S doesn't like profiling.
- NO_PROFILE=
Added: trunk/zfsutils/debian/patches/libmd.diff
===================================================================
--- trunk/zfsutils/debian/patches/libmd.diff (rev 0)
+++ trunk/zfsutils/debian/patches/libmd.diff 2016-06-09 23:20:53 UTC (rev 6067)
@@ -0,0 +1,14 @@
+Date: Fri, 10 Jun 2016 00:03:19 +0100
+From: Steven Chamberlain <steven at pyro.eu.org>
+Subject: use system sha2.h from libmd
+
+--- a/cddl/compat/opensolaris/include/sha2.h
++++ b/cddl/compat/opensolaris/include/sha2.h
+@@ -29,6 +29,7 @@
+ #ifndef _OPENSOLARIS_SHA2_H_
+ #define _OPENSOLARIS_SHA2_H_
+
++#include_next <sha2.h>
+ #include_next <sha256.h>
+
+ #define SHA256Init(c) SHA256_Init(c)
Modified: trunk/zfsutils/debian/patches/makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/makefile.diff 2016-06-09 22:23:01 UTC (rev 6066)
+++ trunk/zfsutils/debian/patches/makefile.diff 2016-06-09 23:20:53 UTC (rev 6067)
@@ -9,38 +9,6 @@
WARNS?= 0
CFLAGS+= -DNATIVE_BUILD
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
---- a/cddl/lib/libzfs/Makefile
-+++ b/cddl/lib/libzfs/Makefile
-@@ -8,7 +8,13 @@
- LIB= zfs
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- ${LIBAVL} ${LIBZFS_CORE}
--LDADD= -lmd -lpthread -lumem -lutil -lavl -lzfs_core
-+LDADD= -lmd -lpthread -lumem -lzfs_core
-+
-+LDADD+= -lbsd -lm -luutil -lnvpair -lgeom
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
-
- SRCS= deviceid.c \
- fsshare.c \
---- a/cddl/lib/libzpool/Makefile
-+++ b/cddl/lib/libzpool/Makefile
-@@ -57,7 +57,11 @@
- CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
-
- DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
--LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl
-+LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl-illumos -lbsd -lrt
-+
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libavl
-
- # atomic.S doesn't like profiling.
- NO_PROFILE=
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -26,7 +26,13 @@
@@ -138,8 +106,8 @@
+LDADD+= -lbsd
+
SRCS= libzfs_core.c \
- libzfs_core_compat.c
-
+ libzfs_core_compat.c \
+ zfs_ioctl_compat.c
--- a/cddl/lib/libavl/Makefile
+++ b/cddl/lib/libavl/Makefile
@@ -2,7 +2,7 @@
@@ -151,3 +119,37 @@
SRCS= avl.c
WARNS?= 0
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+--- a/cddl/lib/libzfs/Makefile
++++ b/cddl/lib/libzfs/Makefile
+@@ -10,9 +10,15 @@
+ ${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \
+ ${LIBNVPAIR} ${LIBZ}
+
+-LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
++LDADD= -lmd -lpthread -lumem -luutil -lm -lnvpair \
+ -lbsdxml -lgeom -lnvpair -lz -lzfs_core
+
++LDADD+= -lbsd -lm -luutil -lnvpair -lgeom
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
++
+ SRCS= deviceid.c \
+ fsshare.c \
+ mkdirp.c \
+--- a/cddl/lib/libzpool/Makefile
++++ b/cddl/lib/libzpool/Makefile
+@@ -58,7 +58,11 @@
+
+ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \
+ ${LIBAVL} ${LIBUMEM}
+-LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem
++LDADD= -lmd -lpthread -lz -lnvpair -lavl-illumos -lbsd -lrt -lumem
++
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libavl
+
+ # atomic.S doesn't like profiling.
+ NO_PROFILE=
Added: trunk/zfsutils/debian/patches/noinline.diff
===================================================================
--- trunk/zfsutils/debian/patches/noinline.diff (rev 0)
+++ trunk/zfsutils/debian/patches/noinline.diff 2016-06-09 23:20:53 UTC (rev 6067)
@@ -0,0 +1,48 @@
+Date: Fri, 10 Jun 2016 00:04:19 +0100
+From: Steven Chamberlain <steven at pyro.eu.org>
+Subject: convert to using __attribute__ keyword
+
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
+@@ -3539,7 +3539,7 @@
+ extern kmem_cache_t *zio_data_buf_cache[];
+ extern kmem_cache_t *range_seg_cache;
+
+-static __noinline void
++static __attribute__((noinline)) void
+ arc_kmem_reap_now(void)
+ {
+ size_t i;
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
+@@ -354,7 +354,7 @@
+ * On return, the transaction group has reached a stable state in which it can
+ * then be passed off to the syncing context.
+ */
+-static __noinline void
++static __attribute__((noinline)) void
+ txg_quiesce(dsl_pool_t *dp, uint64_t txg)
+ {
+ tx_state_t *tx = &dp->dp_tx;
+--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
++++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
+@@ -520,7 +520,7 @@
+ }
+ }
+
+-static __noinline int
++static __attribute__((noinline)) int
+ vdev_queue_max_async_writes(spa_t *spa)
+ {
+ int writes;
+--- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
++++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
+@@ -1273,7 +1273,7 @@
+ #if defined(sun)
+ extern uint64_t dtrace_getarg(int, int);
+ #else
+-extern uint64_t __noinline dtrace_getarg(int, int);
++extern uint64_t __attribute__((noinline)) dtrace_getarg(int, int);
+ #endif
+ extern greg_t dtrace_getfp(void);
+ extern int dtrace_getipl(void);
Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series 2016-06-09 22:23:01 UTC (rev 6066)
+++ trunk/zfsutils/debian/patches/series 2016-06-09 23:20:53 UTC (rev 6067)
@@ -3,9 +3,9 @@
# Mergeable material
compat_opensolaris.diff
disable_libjail.diff
-gratuitous_dependencies.diff
#manpage_hyphens.diff
assfail_protection.diff
+13_freebsd.diff
14_bootloader_advice.diff
# Other patches that might or might not be mergeable
@@ -21,3 +21,5 @@
match_glibc_idtype.diff
bug762199.patch
bug653929.diff
+libmd.diff
+noinline.diff
Modified: trunk/zfsutils/debian/patches/solaris_rlim64_t.diff
===================================================================
--- trunk/zfsutils/debian/patches/solaris_rlim64_t.diff 2016-06-09 22:23:01 UTC (rev 6066)
+++ trunk/zfsutils/debian/patches/solaris_rlim64_t.diff 2016-06-09 23:20:53 UTC (rev 6067)
@@ -1,17 +1,17 @@
--- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
-@@ -521,7 +521,7 @@ vn_openat(char *path, int x1, int flags,
+@@ -523,7 +523,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)
+- 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
-@@ -117,8 +117,8 @@ extern "C" {
+@@ -117,8 +117,8 @@
#define ZFS_LOG(...) do { } while (0)
@@ -22,7 +22,7 @@
#ifdef ZFS_DEBUG
extern void dprintf_setup(int *argc, char **argv);
-@@ -513,7 +513,7 @@ extern int vn_open(char *path, int x1, i
+@@ -523,7 +523,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,
@@ -33,7 +33,7 @@
#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
-@@ -801,7 +801,7 @@ static int
+@@ -850,7 +850,7 @@
zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
{
znode_t *zp = VTOZ(vp);
Modified: trunk/zfsutils/debian/patches/ulong_t.diff
===================================================================
--- trunk/zfsutils/debian/patches/ulong_t.diff 2016-06-09 22:23:01 UTC (rev 6066)
+++ trunk/zfsutils/debian/patches/ulong_t.diff 2016-06-09 23:20:53 UTC (rev 6067)
@@ -1,11 +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 @@
+@@ -383,7 +383,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;
-
+ #if defined(__FreeBSD__) && defined(_KERNEL) && defined(HAVE_INLINE_FLSL)
+ return (flsl(i));
More information about the Glibc-bsd-commits
mailing list