CVS commit: src/sys/dev/sysmon

[Paul Goyette]

Module Name:    src
Committed By:   pgoyette
Date:           Fri Apr 24 00:31:04 UTC 2015

Modified Files:
        src/sys/dev/sysmon: sysmon_taskq.c sysmon_taskq.h

Log Message:
This really does need to return an error code, so change the
sysmon_task_queue_fini() function to have a non-void type.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/sysmon/sysmon_taskq.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/sysmon/sysmon_taskq.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/sysmon/sysmon_taskq.c
diff -u src/sys/dev/sysmon/sysmon_taskq.c:1.16 src/sys/dev/sysmon/sysmon_taskq.c:1.17
--- src/sys/dev/sysmon/sysmon_taskq.c:1.16	Fri Apr 24 00:04:47 2015
+++ src/sys/dev/sysmon/sysmon_taskq.c	Fri Apr 24 00:31:04 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysmon_taskq.c,v 1.16 2015/04/24 00:04:47 agc Exp $	*/
+/*	$NetBSD: sysmon_taskq.c,v 1.17 2015/04/24 00:31:04 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_taskq.c,v 1.16 2015/04/24 00:04:47 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_taskq.c,v 1.17 2015/04/24 00:31:04 pgoyette Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -134,12 +134,12 @@ sysmon_task_queue_init(void)
  *
  *	Tear town the sysmon task queue.
  */
-void
+int
 sysmon_task_queue_fini(void)
 {
 
 	if (sysmon_task_queue_initialized > 1)
-		return;
+		return EBUSY;
 
 	mutex_enter(&sysmon_task_queue_mtx);
 
@@ -151,6 +151,8 @@ sysmon_task_queue_fini(void)
 			&sysmon_task_queue_mtx);
 
 	mutex_exit(&sysmon_task_queue_mtx);
+
+	return 0;
 }
 
 /*
@@ -250,8 +252,7 @@ sysmon_taskq_modcmd(modcmd_t cmd, void *
 		break;
  
 	case MODULE_CMD_FINI: 
-		sysmon_task_queue_fini();
-		ret = 0;
+		ret = sysmon_task_queue_fini();
 		break;
  
 	case MODULE_CMD_STAT:

Index: src/sys/dev/sysmon/sysmon_taskq.h
diff -u src/sys/dev/sysmon/sysmon_taskq.h:1.2 src/sys/dev/sysmon/sysmon_taskq.h:1.3
--- src/sys/dev/sysmon/sysmon_taskq.h:1.2	Sat Jul 21 23:15:17 2007
+++ src/sys/dev/sysmon/sysmon_taskq.h	Fri Apr 24 00:31:04 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysmon_taskq.h,v 1.2 2007/07/21 23:15:17 xtraeme Exp $	*/
+/*	$NetBSD: sysmon_taskq.h,v 1.3 2015/04/24 00:31:04 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
 
 void	sysmon_task_queue_preinit(void);
 void	sysmon_task_queue_init(void);
-void	sysmon_task_queue_fini(void);
+int	sysmon_task_queue_fini(void);
 int	sysmon_task_queue_sched(u_int, void (*)(void *), void *);
 
 #endif /* _DEV_SYSMON_SYSMON_TASKQ_H_ */