Constify functions to prevent USE=debug build failure in sys-fs/zfs

(Portage version: 2.1.10.49/cvs/Linux x86_64)

4 files changed, 105 insertions, 3 deletions

diff --git a/sys-kernel/spl/ChangeLog b/sys-kernel/spl/ChangeLog
index e085c7d8fb1f..1789eb30b02e 100644
--- a/sys-kernel/spl/ChangeLog
+++ b/sys-kernel/spl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/spl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.20 2012/06/18 15:18:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.21 2012/06/25 17:54:06 ryao Exp $
+
+*spl-0.6.0_rc9-r1 (25 Jun 2012)
+
+  25 Jun 2012; Richard Yao <ryao@gentoo.org>
+  +files/spl-0.6.0_rc9-constify-free-functions.patch, +spl-0.6.0_rc9-r1.ebuild,
+  -spl-0.6.0_rc9.ebuild, spl-9999.ebuild:
+  Constify functions to prevent USE=debug build failure in sys-fs/zfs
 
   18 Jun 2012; Richard Yao <ryao@gentoo.org> spl-9999.ebuild:
   Keep spl-0.6.0_rc9.ebuild and spl-9999.ebuild in sync
diff --git a/sys-kernel/spl/files/spl-0.6.0_rc9-constify-free-functions.patch b/sys-kernel/spl/files/spl-0.6.0_rc9-constify-free-functions.patch
new file mode 100644
index 000000000000..fdf2acf66aa4
--- /dev/null
+++ b/sys-kernel/spl/files/spl-0.6.0_rc9-constify-free-functions.patch
@@ -0,0 +1,93 @@
+From 9517a46638c8b2c22a69903e24081de4f608fde7 Mon Sep 17 00:00:00 2001
+From: Richard Yao <ryao@cs.stonybrook.edu>
+Date: Mon, 25 Jun 2012 13:22:21 -0400
+Subject: [PATCH] Constify memory management functions
+
+This avoids build failures on Linux 3.3.y and later.
+
+Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
+---
+ include/sys/kmem.h    |    8 ++++----
+ module/spl/spl-kmem.c |   10 +++++-----
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/include/sys/kmem.h b/include/sys/kmem.h
+index eda4eee..796af44 100644
+--- a/include/sys/kmem.h
++++ b/include/sys/kmem.h
+@@ -214,9 +214,9 @@
+ #  define vmem_free(ptr, sz)            vmem_free_track((ptr), (sz))
+ 
+ extern void *kmem_alloc_track(size_t, int, const char *, int, int, int);
+-extern void kmem_free_track(void *, size_t);
++extern void kmem_free_track(const void *, size_t);
+ extern void *vmem_alloc_track(size_t, int, const char *, int);
+-extern void vmem_free_track(void *, size_t);
++extern void vmem_free_track(const void *, size_t);
+ 
+ # else /* DEBUG_KMEM_TRACKING */
+ /*
+@@ -243,9 +243,9 @@
+ #  define vmem_free(ptr, sz)            vmem_free_debug((ptr), (sz))
+ 
+ extern void *kmem_alloc_debug(size_t, int, const char *, int, int, int);
+-extern void kmem_free_debug(void *, size_t);
++extern void kmem_free_debug(const void *, size_t);
+ extern void *vmem_alloc_debug(size_t, int, const char *, int);
+-extern void vmem_free_debug(void *, size_t);
++extern void vmem_free_debug(const void *, size_t);
+ 
+ # endif /* DEBUG_KMEM_TRACKING */
+ #else /* DEBUG_KMEM */
+diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c
+index a50927c..448297a 100644
+--- a/module/spl/spl-kmem.c
++++ b/module/spl/spl-kmem.c
+@@ -385,7 +385,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
+ EXPORT_SYMBOL(vmem_list);
+ 
+ static kmem_debug_t *
+-kmem_del_init(spinlock_t *lock, struct hlist_head *table, int bits, void *addr)
++kmem_del_init(spinlock_t *lock, struct hlist_head *table, int bits, const void *addr)
+ {
+ 	struct hlist_head *head;
+ 	struct hlist_node *node;
+@@ -504,7 +504,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
+ EXPORT_SYMBOL(kmem_alloc_track);
+ 
+ void
+-kmem_free_track(void *ptr, size_t size)
++kmem_free_track(const void *ptr, size_t size)
+ {
+ 	kmem_debug_t *dptr;
+ 	SENTRY;
+@@ -619,7 +619,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
+ EXPORT_SYMBOL(vmem_alloc_track);
+ 
+ void
+-vmem_free_track(void *ptr, size_t size)
++vmem_free_track(const void *ptr, size_t size)
+ {
+ 	kmem_debug_t *dptr;
+ 	SENTRY;
+@@ -706,7 +706,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
+ EXPORT_SYMBOL(kmem_alloc_debug);
+ 
+ void
+-kmem_free_debug(void *ptr, size_t size)
++kmem_free_debug(const void *ptr, size_t size)
+ {
+ 	SENTRY;
+ 
+@@ -758,7 +758,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
+ EXPORT_SYMBOL(vmem_alloc_debug);
+ 
+ void
+-vmem_free_debug(void *ptr, size_t size)
++vmem_free_debug(const void *ptr, size_t size)
+ {
+ 	SENTRY;
+ 
+-- 
+1.7.10
+
diff --git a/sys-kernel/spl/spl-0.6.0_rc9.ebuild b/sys-kernel/spl/spl-0.6.0_rc9-r1.ebuild
index e2125e79fd44..1691bf41858f 100644
--- a/sys-kernel/spl/spl-0.6.0_rc9.ebuild
+++ b/sys-kernel/spl/spl-0.6.0_rc9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc9.ebuild,v 1.4 2012/06/18 15:17:06 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc9-r1.ebuild,v 1.1 2012/06/25 17:54:06 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -52,6 +52,7 @@ src_prepare() {
 	if [ ${PV} != "9999" ]
 	then
 		epatch "${FILESDIR}/${P}-detect-kernel-honors-gfp-flags.patch"
+		epatch "${FILESDIR}/${P}-constify-free-functions.patch"
 	fi
 
 	autotools-utils_src_prepare
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild
index 0528ae8f2288..5dd693a9623e 100644
--- a/sys-kernel/spl/spl-9999.ebuild
+++ b/sys-kernel/spl/spl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.18 2012/06/18 15:18:12 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.19 2012/06/25 17:54:06 ryao Exp $
 
 EAPI="4"
 AUTOTOOLS_AUTORECONF="1"
@@ -52,6 +52,7 @@ src_prepare() {
 	if [ ${PV} != "9999" ]
 	then
 		epatch "${FILESDIR}/${P}-detect-kernel-honors-gfp-flags.patch"
+		epatch "${FILESDIR}/${P}-constify-free-functions.patch"
 	fi
 
 	autotools-utils_src_prepare