diff --git a/[refs] b/[refs]
index 080628d39736..68db60605c5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d79d792ef9f99cca463b6619a93e860d1c833a6e
+refs/heads/master: 3a765edadb28cc736d185f67d1ba6bedcc85f4b9
diff --git a/trunk/net/core/net_namespace.c b/trunk/net/core/net_namespace.c
index 4026a4cff93c..bd8c4712ea24 100644
--- a/trunk/net/core/net_namespace.c
+++ b/trunk/net/core/net_namespace.c
@@ -413,8 +413,11 @@ static int register_pernet_operations(struct list_head *list,
 		}
 	}
 	error = __register_pernet_operations(list, ops);
-	if (error && ops->id)
-		ida_remove(&net_generic_ids, *ops->id);
+	if (error) {
+		rcu_barrier();
+		if (ops->id)
+			ida_remove(&net_generic_ids, *ops->id);
+	}
 
 	return error;
 }
@@ -423,6 +426,7 @@ static void unregister_pernet_operations(struct pernet_operations *ops)
 {
 	
 	__unregister_pernet_operations(ops);
+	rcu_barrier();
 	if (ops->id)
 		ida_remove(&net_generic_ids, *ops->id);
 }