netns: Add an explicit rcu_barrier to unregister_pernet_{device|subsys}
authorEric W. Biederman <ebiederm@xmission.com>
Thu, 3 Dec 2009 02:29:06 +0000 (02:29 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2009 20:22:03 +0000 (12:22 -0800)
This allows namespace exit methods to batch work that comes requires an
rcu barrier using call_rcu without having to treat the
unregister_pernet_operations cases specially.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/net_namespace.c

index 4026a4cff93cd44aa3b240c710e6bbcf30d90132..bd8c4712ea247582f885203960db9bd7a2a310ce 100644 (file)
@@ -413,8 +413,11 @@ again:
                }
        }
        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);
 }