[NETNS]: Add netns parameter to fib_rules_(un)register.

The patch extends the different fib rules API in order to pass the
network namespace pointer. That will allow to access the different
tables from a namespace relative object. As usual, the pointer to the
init_net variable is passed as parameter so we don't break the
network.

Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index 2364db1a47e62e7c21f2b973db0999c9e6c7b852..f7351b0ad5524b0f4df12ad11335f8cedc52e6a3 100644 (file)
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -101,8 +101,8 @@ static inline u32 frh_get_table(struct fib_rule_hdr *frh, struct nlattr **nla)
        return frh->table;
 }
 
-extern int                     fib_rules_register(struct fib_rules_ops *);
-extern int                     fib_rules_unregister(struct fib_rules_ops *);
+extern int fib_rules_register(struct net *, struct fib_rules_ops *);
+extern int fib_rules_unregister(struct net *, struct fib_rules_ops *);
 extern void                     fib_rules_cleanup_ops(struct fib_rules_ops *);
 
 extern int                     fib_rules_lookup(struct fib_rules_ops *,

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index fcbf41c0a5d490b0096fbaba083427a802d96bfa..ada9c8155e3c4570e554eaf8480b5bb1b6445f4a 100644 (file)
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -74,7 +74,7 @@ static void flush_route_cache(struct fib_rules_ops *ops)
                ops->flush_cache();
 }
 
-int fib_rules_register(struct fib_rules_ops *ops)
+int fib_rules_register(struct net *net, struct fib_rules_ops *ops)
 {
        int err = -EEXIST;
        struct fib_rules_ops *o;
@@ -113,7 +113,7 @@ void fib_rules_cleanup_ops(struct fib_rules_ops *ops)
 }
 EXPORT_SYMBOL_GPL(fib_rules_cleanup_ops);
 
-int fib_rules_unregister(struct fib_rules_ops *ops)
+int fib_rules_unregister(struct net *net, struct fib_rules_ops *ops)
 {
        int err = 0;
        struct fib_rules_ops *o;

diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index ffebea04cc99b9f6c5820734f057f9307ed5e333..0b5e2b97e15a1257fa0e27344564b3f62555851a 100644 (file)
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -255,12 +255,12 @@ void __init dn_fib_rules_init(void)
 {
        BUG_ON(fib_default_rule_add(&dn_fib_rules_ops, 0x7fff,
                                    RT_TABLE_MAIN, 0));
-       fib_rules_register(&dn_fib_rules_ops);
+       fib_rules_register(&init_net, &dn_fib_rules_ops);
 }
 
 void __exit dn_fib_rules_cleanup(void)
 {
-       fib_rules_unregister(&dn_fib_rules_ops);
+       fib_rules_unregister(&init_net, &dn_fib_rules_ops);
 }
 
 

diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index a0ada3a8d8dd8c2cfd931cc0c475c73aadf8d62b..eac3f717ecabd833777e94c63e746f263dc157b9 100644 (file)
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -314,5 +314,5 @@ static int __init fib_default_rules_init(void)
 void __init fib4_rules_init(void)
 {
        BUG_ON(fib_default_rules_init());
-       fib_rules_register(&fib4_rules_ops);
+       fib_rules_register(&init_net, &fib4_rules_ops);
 }

diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index 9ce2e0a6748a75a0a1947faa622b9d2f8853cf36..e4d7e5a08b4060a06dd70e815aff20fac95f45d2 100644 (file)
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -273,7 +273,7 @@ int __init fib6_rules_init(void)
        if (ret)
                goto out;
 
-       ret = fib_rules_register(&fib6_rules_ops);
+       ret = fib_rules_register(&init_net, &fib6_rules_ops);
        if (ret)
                goto out_default_rules_init;
 out:
@@ -286,5 +286,5 @@ out_default_rules_init:
 
 void fib6_rules_cleanup(void)
 {
-       fib_rules_unregister(&fib6_rules_ops);
+       fib_rules_unregister(&init_net, &fib6_rules_ops);
 }