summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-01-09 22:19:13 -0800
committerEric W. Biederman <ebiederm@xmission.com>2012-01-24 16:37:55 -0800
commit97324cd804b7b9fb6044e114329335db79810425 (patch)
treeffebd82bb36069d38b9063328920f39434eb5155
parenta15e20982e2fbb06e85da584a0f150784042c17d (diff)
downloadlinux-3.10-97324cd804b7b9fb6044e114329335db79810425.tar.gz
linux-3.10-97324cd804b7b9fb6044e114329335db79810425.tar.bz2
linux-3.10-97324cd804b7b9fb6044e114329335db79810425.zip
sysctl: Implement retire_sysctl_set
This adds a small helper retire_sysctl_set to remove the intimate knowledge about the how a sysctl_set is implemented from net/sysct_net.c Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
-rw-r--r--fs/proc/proc_sysctl.c4
-rw-r--r--include/linux/sysctl.h1
-rw-r--r--net/sysctl_net.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index f6aa75111b4..9d8223cd365 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -1080,6 +1080,10 @@ void setup_sysctl_set(struct ctl_table_set *p,
p->is_seen = is_seen;
}
+void retire_sysctl_set(struct ctl_table_set *set)
+{
+ WARN_ON(!list_empty(&set->list));
+}
int __init proc_sys_init(void)
{
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 08cabbfddac..475ff0e35e6 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -1072,6 +1072,7 @@ void proc_sys_poll_notify(struct ctl_table_poll *poll);
extern void setup_sysctl_set(struct ctl_table_set *p,
struct ctl_table_set *parent,
int (*is_seen)(struct ctl_table_set *));
+extern void retire_sysctl_set(struct ctl_table_set *set);
void register_sysctl_root(struct ctl_table_root *root);
struct ctl_table_header *__register_sysctl_paths(
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index a6bbee2bc71..ffd67a6515a 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -82,7 +82,7 @@ static int __net_init sysctl_net_init(struct net *net)
static void __net_exit sysctl_net_exit(struct net *net)
{
- WARN_ON(!list_empty(&net->sysctls.list));
+ retire_sysctl_set(&net->sysctls);
}
static struct pernet_operations sysctl_pernet_ops = {