summaryrefslogtreecommitdiff
path: root/sys/dev/sysmon
diff options
context:
space:
mode:
authorpgoyette <pgoyette@NetBSD.org>2015-04-24 00:31:04 +0000
committerpgoyette <pgoyette@NetBSD.org>2015-04-24 00:31:04 +0000
commit7bfc276e586ae7cc95c673505880e7b0d78aa3fe (patch)
treea7ddeb9401882fe850535522a0f20589d1017d9c /sys/dev/sysmon
parent1294d40666e7c434e64eb5b9d173abdf28b6a4b1 (diff)
This really does need to return an error code, so change the
sysmon_task_queue_fini() function to have a non-void type.
Diffstat (limited to 'sys/dev/sysmon')
-rw-r--r--sys/dev/sysmon/sysmon_taskq.c13
-rw-r--r--sys/dev/sysmon/sysmon_taskq.h4
2 files changed, 9 insertions, 8 deletions
diff --git a/sys/dev/sysmon/sysmon_taskq.c b/sys/dev/sysmon/sysmon_taskq.c
index 5e88c3bcf43..3c2a37252bc 100644
--- a/sys/dev/sysmon/sysmon_taskq.c
+++ b/sys/dev/sysmon/sysmon_taskq.c
@@ -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 *arg)
break;
case MODULE_CMD_FINI:
- sysmon_task_queue_fini();
- ret = 0;
+ ret = sysmon_task_queue_fini();
break;
case MODULE_CMD_STAT:
diff --git a/sys/dev/sysmon/sysmon_taskq.h b/sys/dev/sysmon/sysmon_taskq.h
index 8b8f36ef82b..707669741ec 100644
--- a/sys/dev/sysmon/sysmon_taskq.h
+++ b/sys/dev/sysmon/sysmon_taskq.h
@@ -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_ */