From 899150dfc7716d4f66c6eb3dbb7f9ae685303957 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Mon, 9 Jan 2012 22:19:13 -0800
Subject: [PATCH] --- yaml --- r: 295445 b: refs/heads/master c:
 97324cd804b7b9fb6044e114329335db79810425 h: refs/heads/master i:   295443:
 e7fd4aad838cfe892f099f84d5375b294580f702 v: v3

---
 [refs]                       | 2 +-
 trunk/fs/proc/proc_sysctl.c  | 4 ++++
 trunk/include/linux/sysctl.h | 1 +
 trunk/net/sysctl_net.c       | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8e446cd3f2ff..c74b946a10c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a15e20982e2fbb06e85da584a0f150784042c17d
+refs/heads/master: 97324cd804b7b9fb6044e114329335db79810425
diff --git a/trunk/fs/proc/proc_sysctl.c b/trunk/fs/proc/proc_sysctl.c
index f6aa75111b41..9d8223cd3655 100644
--- a/trunk/fs/proc/proc_sysctl.c
+++ b/trunk/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/trunk/include/linux/sysctl.h b/trunk/include/linux/sysctl.h
index 08cabbfddacb..475ff0e35e63 100644
--- a/trunk/include/linux/sysctl.h
+++ b/trunk/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/trunk/net/sysctl_net.c b/trunk/net/sysctl_net.c
index a6bbee2bc710..ffd67a6515a3 100644
--- a/trunk/net/sysctl_net.c
+++ b/trunk/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 = {