Date: Sun, 28 Dec 2014 19:24:02 +0000 (UTC) From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276341 - head/sys/kern Message-ID: <201412281924.sBSJO284028980@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mjg Date: Sun Dec 28 19:24:01 2014 New Revision: 276341 URL: https://svnweb.freebsd.org/changeset/base/276341 Log: sysctl: don't modify oid_running for static nodes It is necessary to prevent nodes from being destroyed while used, but static ones cannot be destroyed. Modified: head/sys/kern/kern_sysctl.c Modified: head/sys/kern/kern_sysctl.c ============================================================================== --- head/sys/kern/kern_sysctl.c Sun Dec 28 19:05:32 2014 (r276340) +++ head/sys/kern/kern_sysctl.c Sun Dec 28 19:24:01 2014 (r276341) @@ -174,7 +174,8 @@ sysctl_root_handler_locked(struct sysctl int error; bool xlocked; - atomic_add_int(&oid->oid_running, 1); + if (oid->oid_kind & CTLFLAG_DYN) + atomic_add_int(&oid->oid_running, 1); xlocked = sysctl_unlock(); if (!(oid->oid_kind & CTLFLAG_MPSAFE)) @@ -184,9 +185,11 @@ sysctl_root_handler_locked(struct sysctl mtx_unlock(&Giant); sysctl_lock(xlocked); - if (atomic_fetchadd_int(&oid->oid_running, -1) == 1 && - (oid->oid_kind & CTLFLAG_DYING) != 0) - wakeup(&oid->oid_running); + if (oid->oid_kind & CTLFLAG_DYN) { + if (atomic_fetchadd_int(&oid->oid_running, -1) == 1 && + (oid->oid_kind & CTLFLAG_DYING) != 0) + wakeup(&oid->oid_running); + } return (error); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412281924.sBSJO284028980>