svn commit: r198012 - in user/kmacy/releng_8_fcs/sys/cddl: compat/opensolaris/sys contrib/opensolaris/uts/common/fs/zfs

[Kip Macy]

Author: kmacy
Date: Tue Oct 13 01:58:50 2009
New Revision: 198012
URL: http://svn.freebsd.org/changeset/base/198012

Log:
  exclude ZFS data buffers from minidumps

Modified:
  user/kmacy/releng_8_fcs/sys/cddl/compat/opensolaris/sys/kmem.h
  user/kmacy/releng_8_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c

Modified: user/kmacy/releng_8_fcs/sys/cddl/compat/opensolaris/sys/kmem.h
==============================================================================
--- user/kmacy/releng_8_fcs/sys/cddl/compat/opensolaris/sys/kmem.h	Tue Oct 13 01:48:01 2009	(r198011)
+++ user/kmacy/releng_8_fcs/sys/cddl/compat/opensolaris/sys/kmem.h	Tue Oct 13 01:58:50 2009	(r198012)
@@ -40,7 +40,8 @@
 #define	KM_SLEEP		M_WAITOK
 #define	KM_PUSHPAGE		M_WAITOK
 #define	KM_NOSLEEP		M_NOWAIT
-#define	KMC_NODEBUG		0
+#define	KMC_NODEBUG		UMA_ZONE_NODUMP
+#define	KM_NODEBUG		M_NODUMP
 
 typedef struct kmem_cache {
 	char		kc_name[32];

Modified: user/kmacy/releng_8_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- user/kmacy/releng_8_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Tue Oct 13 01:48:01 2009	(r198011)
+++ user/kmacy/releng_8_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Tue Oct 13 01:58:50 2009	(r198012)
@@ -121,7 +121,7 @@ zio_init(void)
 			char name[36];
 			(void) sprintf(name, "zio_buf_%lu", (ulong_t)size);
 			zio_buf_cache[c] = kmem_cache_create(name, size,
-			    align, NULL, NULL, NULL, NULL, NULL, KMC_NODEBUG);
+			    align, NULL, NULL, NULL, NULL, NULL, 0);
 
 			(void) sprintf(name, "zio_data_buf_%lu", (ulong_t)size);
 			zio_data_buf_cache[c] = kmem_cache_create(name, size,
@@ -214,7 +214,7 @@ zio_data_buf_alloc(size_t size)
 
 	return (kmem_cache_alloc(zio_data_buf_cache[c], KM_PUSHPAGE));
 #else
-	return (kmem_alloc(size, KM_SLEEP));
+	return (kmem_alloc(size, KM_SLEEP|KM_NODEBUG));
 #endif
 }