[Glibc-bsd-commits] r5000 - in trunk/zfsutils/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sun Oct 6 13:04:46 UTC 2013
Author: rmh
Date: 2013-10-06 13:04:45 +0000 (Sun, 06 Oct 2013)
New Revision: 5000
Removed:
trunk/zfsutils/debian/patches/01_glibc_kludge.diff
Modified:
trunk/zfsutils/debian/changelog
trunk/zfsutils/debian/control
trunk/zfsutils/debian/patches/03_glibc_namespace.diff
trunk/zfsutils/debian/patches/09_xdr_control.diff
trunk/zfsutils/debian/patches/series
Log:
Remove some unneeded compatibility cruft.
Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog 2013-10-06 12:38:50 UTC (rev 4999)
+++ trunk/zfsutils/debian/changelog 2013-10-06 13:04:45 UTC (rev 5000)
@@ -13,6 +13,7 @@
- Requires freebsd-glue >= 0.1.1.
- fix_implicit_warnx_declaration.diff: Cherry-pick from HEAD.
- 03_glibc_namespace.diff: Extend solaris_hasmntopt kludge.
+ * Remove some unneeded compatibility cruft.
-- Robert Millan <rmh at debian.org> Thu, 03 Oct 2013 01:49:26 +0200
Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control 2013-10-06 12:38:50 UTC (rev 4999)
+++ trunk/zfsutils/debian/control 2013-10-06 13:04:45 UTC (rev 5000)
@@ -11,7 +11,7 @@
libgeom-dev,
zlib1g-dev,
libjail-dev,
- freebsd-glue (>= 0.1.1~),
+ freebsd-glue (>= 0.1.8~),
Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/zfsutils/
Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/zfsutils/
Standards-Version: 3.9.3
Deleted: trunk/zfsutils/debian/patches/01_glibc_kludge.diff
===================================================================
--- trunk/zfsutils/debian/patches/01_glibc_kludge.diff 2013-10-06 12:38:50 UTC (rev 4999)
+++ trunk/zfsutils/debian/patches/01_glibc_kludge.diff 2013-10-06 13:04:45 UTC (rev 5000)
@@ -1,58 +0,0 @@
----
- cddl/compat/opensolaris/misc/mnttab.c | 2 +-
- cddl/compat/opensolaris/misc/zmount.c | 3 +++
- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c | 6 +++---
- 3 files changed, 7 insertions(+), 4 deletions(-)
-
---- a/cddl/compat/opensolaris/misc/mnttab.c
-+++ b/cddl/compat/opensolaris/misc/mnttab.c
-@@ -164,7 +164,7 @@
- }
-
- int
--getmntany(FILE *fd __unused, struct mnttab *mgetp, struct mnttab *mrefp)
-+getmntany(FILE *fd, struct mnttab *mgetp, struct mnttab *mrefp)
- {
- struct statfs *sfs;
- int i, error;
---- a/cddl/compat/opensolaris/misc/zmount.c
-+++ b/cddl/compat/opensolaris/misc/zmount.c
-@@ -95,6 +95,9 @@
- if (mflag & MS_RDONLY)
- build_iovec(&iov, &iovlen, "ro", NULL, 0);
- build_iovec(&iov, &iovlen, "fstype", fstype, (size_t)-1);
-+#ifndef __DECONST
-+#define __DECONST(type, var) ((type)(uintptr_t)(const void *)(var))
-+#endif
- build_iovec(&iov, &iovlen, "fspath", __DECONST(char *, dir),
- (size_t)-1);
- build_iovec(&iov, &iovlen, "from", __DECONST(char *, spec), (size_t)-1);
---- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
-+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
-@@ -2505,7 +2505,7 @@
- }
-
- static void
--arc_reclaim_thread(void *dummy __unused)
-+arc_reclaim_thread(void *dummy)
- {
- clock_t growtime = 0;
- arc_reclaim_strategy_t last_reclaim = ARC_RECLAIM_CONS;
-@@ -3931,7 +3931,7 @@
- static eventhandler_tag arc_event_lowmem = NULL;
-
- static void
--arc_lowmem(void *arg __unused, int howto __unused)
-+arc_lowmem(void *arg, int howto)
- {
-
- /* Serialize access via arc_lowmem_lock. */
-@@ -5267,7 +5267,7 @@
- * heart of the L2ARC.
- */
- static void
--l2arc_feed_thread(void *dummy __unused)
-+l2arc_feed_thread(void *dummy)
- {
- callb_cpr_t cpr;
- l2arc_dev_t *dev;
Modified: trunk/zfsutils/debian/patches/03_glibc_namespace.diff
===================================================================
--- trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2013-10-06 12:38:50 UTC (rev 4999)
+++ trunk/zfsutils/debian/patches/03_glibc_namespace.diff 2013-10-06 13:04:45 UTC (rev 5000)
@@ -18,33 +18,6 @@
fprintf(newfd, "%s\n", line);
if (oldfd != NULL && ferror(oldfd) != 0) {
error = ferror(oldfd);
---- a/cddl/compat/opensolaris/misc/mnttab.c
-+++ b/cddl/compat/opensolaris/misc/mnttab.c
-@@ -66,7 +66,7 @@
- }
-
- char *
--hasmntopt(struct mnttab *mnt, char *opt)
-+solaris_hasmntopt(struct mnttab *mnt, char *opt)
- {
- char tmpopts[MNT_LINE_MAX];
- char *f, *opts = tmpopts;
---- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
-+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
-@@ -1829,11 +1829,11 @@
- if (received)
- break;
-
-- if (hasmntopt(&mnt, mntopt_on) && !*val) {
-+ if (solaris_hasmntopt(&mnt, mntopt_on) && !*val) {
- *val = B_TRUE;
- if (src)
- *src = ZPROP_SRC_TEMPORARY;
-- } else if (hasmntopt(&mnt, mntopt_off) && *val) {
-+ } else if (solaris_hasmntopt(&mnt, mntopt_off) && *val) {
- *val = B_FALSE;
- if (src)
- *src = ZPROP_SRC_TEMPORARY;
--- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
@@ -467,7 +467,7 @@
Modified: trunk/zfsutils/debian/patches/09_xdr_control.diff
===================================================================
--- trunk/zfsutils/debian/patches/09_xdr_control.diff 2013-10-06 12:38:50 UTC (rev 4999)
+++ trunk/zfsutils/debian/patches/09_xdr_control.diff 2013-10-06 13:04:45 UTC (rev 5000)
@@ -1,36 +1,5 @@
----
- sys/cddl/compat/opensolaris/rpc/xdr.h | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
--- a/sys/cddl/compat/opensolaris/rpc/xdr.h
+++ b/sys/cddl/compat/opensolaris/rpc/xdr.h
-@@ -34,6 +34,26 @@
-
- #ifndef _KERNEL
-
-+/* Copied from the FreeBSD version of <rpc/xdr.h> */
-+#ifdef __GLIBC__
-+/*
-+ * These are XDR control operators
-+ */
-+
-+#define XDR_GET_BYTES_AVAIL 1
-+#define XDR_PEEK 2
-+#define XDR_SKIPBYTES 3
-+
-+struct xdr_bytesrec {
-+ bool_t xc_is_last_record;
-+ size_t xc_num_avail;
-+};
-+
-+typedef struct xdr_bytesrec xdr_bytesrec;
-+
-+#define xdr_control(xdrs, req, op) XDR_CONTROL(xdrs, req, op)
-+#endif
-+
- #include <assert.h>
-
- /*
@@ -60,10 +80,16 @@
}
Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series 2013-10-06 12:38:50 UTC (rev 4999)
+++ trunk/zfsutils/debian/patches/series 2013-10-06 13:04:45 UTC (rev 5000)
@@ -10,7 +10,6 @@
zfs_needs_libjail.diff
# Other patches that might or might not be mergeable
-01_glibc_kludge.diff
02_glibc_misc.diff
03_glibc_namespace.diff
06_mountd.diff
More information about the Glibc-bsd-commits
mailing list