Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysctl_free: don't have the caller acquire sysctl_treelock, do it here.

Browse Source
This commit is contained in:
ad 2008-01-12 19:27:27 +00:00
parent 2e85c8c3b2
commit c03e2ac7c3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/kern_sysctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_sysctl.c,v 1.213 2008/01/07 16:12:54 ad Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.214 2008/01/12 19:27:27 ad Exp $ */
/*- /*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc. * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@ -75,7 +75,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.213 2008/01/07 16:12:54 ad Exp $"); __KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.214 2008/01/12 19:27:27 ad Exp $");
#include "opt_defcorename.h" #include "opt_defcorename.h"
#include "ksyms.h" #include "ksyms.h"
@ -2227,13 +2227,14 @@ sysctl_free(struct sysctlnode *rnode)
{ {
struct sysctlnode *node, *pnode; struct sysctlnode *node, *pnode;
KASSERT(rw_write_held(&sysctl_treelock)); rw_enter(&sysctl_treelock, RW_WRITER);
if (rnode == NULL) if (rnode == NULL)
rnode = &sysctl_root; rnode = &sysctl_root;
if (SYSCTL_VERS(rnode->sysctl_flags) != SYSCTL_VERSION) { if (SYSCTL_VERS(rnode->sysctl_flags) != SYSCTL_VERSION) {
printf("sysctl_free: rnode %p wrong version\n", rnode); printf("sysctl_free: rnode %p wrong version\n", rnode);
rw_exit(&sysctl_treelock);
return; return;
} }
@ -2280,6 +2281,8 @@ sysctl_free(struct sysctlnode *rnode)
node = pnode; node = pnode;
pnode = node->sysctl_parent; pnode = node->sysctl_parent;
} while (pnode != NULL && node != rnode); } while (pnode != NULL && node != rnode);
rw_exit(&sysctl_treelock);
} }
int int