[Glibc-bsd-commits] r3294 - trunk/zfsutils/debian/patches

[Aurelien Jarno]

Author: aurel32
Date: 2011-04-23 08:49:30 +0000 (Sat, 23 Apr 2011)
New Revision: 3294

Added:
   trunk/zfsutils/debian/patches/15_ztest.fix
Removed:
   trunk/zfsutils/debian/patches/15_zpool.diff
   trunk/zfsutils/debian/patches/16_ztest.fix
Modified:
   trunk/zfsutils/debian/patches/01_glibc_kludge.diff
   trunk/zfsutils/debian/patches/series
Log:
Move 15_zpool.diff instead of 01_glibc_kludge.diff


Modified: trunk/zfsutils/debian/patches/01_glibc_kludge.diff
===================================================================
--- trunk/zfsutils/debian/patches/01_glibc_kludge.diff	2011-04-23 08:43:26 UTC (rev 3293)
+++ trunk/zfsutils/debian/patches/01_glibc_kludge.diff	2011-04-23 08:49:30 UTC (rev 3294)
@@ -23,3 +23,33 @@
  	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
+@@ -2265,7 +2265,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;
+@@ -3771,7 +3771,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. */
+@@ -4828,7 +4828,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;
+v

Deleted: trunk/zfsutils/debian/patches/15_zpool.diff
===================================================================
--- trunk/zfsutils/debian/patches/15_zpool.diff	2011-04-23 08:43:26 UTC (rev 3293)
+++ trunk/zfsutils/debian/patches/15_zpool.diff	2011-04-23 08:49:30 UTC (rev 3294)
@@ -1,14 +0,0 @@
-Index: zfsutils-8.1-patch/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
-===================================================================
---- zfsutils-8.1-patch.orig/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	2011-04-06 17:17:31.000000000 -0400
-+++ zfsutils-8.1-patch/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	2011-04-06 17:17:47.000000000 -0400
-@@ -141,6 +141,9 @@
- extern uint64_t zfs_write_limit_max;
- extern kmutex_t zfs_write_limit_lock;
- 
-+
-+#define __unused __attribute__((unused))
-+
- #define	ARC_REDUCE_DNLC_PERCENT	3
- uint_t arc_reduce_dnlc_percent = ARC_REDUCE_DNLC_PERCENT;
-

Copied: trunk/zfsutils/debian/patches/15_ztest.fix (from rev 3289, trunk/zfsutils/debian/patches/16_ztest.fix)
===================================================================
--- trunk/zfsutils/debian/patches/15_ztest.fix	                        (rev 0)
+++ trunk/zfsutils/debian/patches/15_ztest.fix	2011-04-23 08:49:30 UTC (rev 3294)
@@ -0,0 +1,27 @@
+From: Arno Töll <debian at toell.net>
+Subject: Fix assertion problems for ztest
+
+* cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Fix path problems
+
+Origin: upstream, 
+	http://freshbsd.org/2010/11/01/10/41/05
+
+Cherry pick patch from upstream to get the `ztest' binary working in the 
+ current Debian version of zfsutils. This patch may be removed, as soon
+ as a more recent vesion of zfsutils is shipped with Debian
+
+Last-Update: 2011-04-22
+
+--- a/cddl/contrib/opensolaris/cmd/ztest/ztest.c
++++ b/cddl/contrib/opensolaris/cmd/ztest/ztest.c
+@@ -2907,8 +2907,8 @@
+ 	int isalen;
+ 	FILE *fp;
+ 
+-	if (realpath(progname, zdb) == NULL)
+-		assert(!"realpath() failed");
++	
++	strlcpy(zdb, "/usr/bin/ztest", sizeof(zdb));
+ 
+ 	/* zdb lives in /usr/sbin, while ztest lives in /usr/bin */
+ 	bin = strstr(zdb, "/usr/bin/");

Deleted: trunk/zfsutils/debian/patches/16_ztest.fix
===================================================================
--- trunk/zfsutils/debian/patches/16_ztest.fix	2011-04-23 08:43:26 UTC (rev 3293)
+++ trunk/zfsutils/debian/patches/16_ztest.fix	2011-04-23 08:49:30 UTC (rev 3294)
@@ -1,27 +0,0 @@
-From: Arno Töll <debian at toell.net>
-Subject: Fix assertion problems for ztest
-
-* cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Fix path problems
-
-Origin: upstream, 
-	http://freshbsd.org/2010/11/01/10/41/05
-
-Cherry pick patch from upstream to get the `ztest' binary working in the 
- current Debian version of zfsutils. This patch may be removed, as soon
- as a more recent vesion of zfsutils is shipped with Debian
-
-Last-Update: 2011-04-22
-
---- a/cddl/contrib/opensolaris/cmd/ztest/ztest.c
-+++ b/cddl/contrib/opensolaris/cmd/ztest/ztest.c
-@@ -2907,8 +2907,8 @@
- 	int isalen;
- 	FILE *fp;
- 
--	if (realpath(progname, zdb) == NULL)
--		assert(!"realpath() failed");
-+	
-+	strlcpy(zdb, "/usr/bin/ztest", sizeof(zdb));
- 
- 	/* zdb lives in /usr/sbin, while ztest lives in /usr/bin */
- 	bin = strstr(zdb, "/usr/bin/");

Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series	2011-04-23 08:43:26 UTC (rev 3293)
+++ trunk/zfsutils/debian/patches/series	2011-04-23 08:49:30 UTC (rev 3294)
@@ -12,5 +12,4 @@
 12_freebsd.diff
 13_mnttab.diff
 14_bootloader_advice.diff
-15_zpool.diff
-16_ztest.fix
+15_ztest.fix