svn commit: r192429 - in user/kmacy/releng_7_2_fcs/sys: cddl/compat/opensolaris/sys cddl/contrib/opensolaris/uts/common/fs/zfs kern

[Kip Macy]

Author: kmacy
Date: Wed May 20 07:01:36 2009
New Revision: 192429
URL: http://svn.freebsd.org/changeset/base/192429

Log:
  restore default kthread priority
  raise min / max zfs thread priority

Modified:
  user/kmacy/releng_7_2_fcs/sys/cddl/compat/opensolaris/sys/proc.h
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  user/kmacy/releng_7_2_fcs/sys/kern/kern_kthread.c

Modified: user/kmacy/releng_7_2_fcs/sys/cddl/compat/opensolaris/sys/proc.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/cddl/compat/opensolaris/sys/proc.h	Wed May 20 06:46:18 2009	(r192428)
+++ user/kmacy/releng_7_2_fcs/sys/cddl/compat/opensolaris/sys/proc.h	Wed May 20 07:01:36 2009	(r192429)
@@ -39,8 +39,8 @@
 #ifdef _KERNEL
 
 #define	CPU		curcpu
-#define	minclsyspri	PRIBIO
-#define	maxclsyspri	PSWP
+#define	minclsyspri	PVM
+#define	maxclsyspri	PI_SOFT
 #define	max_ncpus	mp_ncpus
 #define	boot_max_ncpus	mp_ncpus
 

Modified: user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	Wed May 20 06:46:18 2009	(r192428)
+++ user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c	Wed May 20 07:01:36 2009	(r192429)
@@ -823,7 +823,8 @@ zvol_create_minor(const char *name, majo
 	bioq_init(&zv->zv_queue);
 	mtx_init(&zv->zv_queue_mtx, "zvol", NULL, MTX_DEF);
 	zv->zv_state = 0;
-	kthread_create(zvol_worker, zv, NULL, 0, 0, "zvol:worker %s", pp->name);
+	kthread_create_pri(zvol_worker, zv, NULL, 0, 0, PRIBIO,
+	    "zvol:worker %s", pp->name);
 
 	zvol_minors++;
 end:

Modified: user/kmacy/releng_7_2_fcs/sys/kern/kern_kthread.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/kern/kern_kthread.c	Wed May 20 06:46:18 2009	(r192428)
+++ user/kmacy/releng_7_2_fcs/sys/kern/kern_kthread.c	Wed May 20 07:01:36 2009	(r192429)
@@ -93,7 +93,7 @@ kthread_create_pri_v(void (*func)(void *
 		*newpp = p2;
 
 	if (prio == 0)
-		prio = PRI_MAX_KERN;
+		prio = PVM; /* XXX compatibility :-{ */
 
 	/* this is a non-swapped system process */
 	PROC_LOCK(p2);