nfsd4: reshuffle lease-setting code to allow reuse

[safe/jmp/linux-2.6] / include / net / fib_rules.h

diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index 4f47250..c07ac96 100644 (file)
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -7,12 +7,11 @@
 #include <net/flow.h>
 #include <net/rtnetlink.h>
 
-struct fib_rule
-{
+struct fib_rule {
        struct list_head        list;
        atomic_t                refcnt;
-       int                     ifindex;
-       char                    ifname[IFNAMSIZ];
+       int                     iifindex;
+       int                     oifindex;
        u32                     mark;
        u32                     mark_mask;
        u32                     pref;
@@ -21,18 +20,19 @@ struct fib_rule
        u8                      action;
        u32                     target;
        struct fib_rule *       ctarget;
+       char                    iifname[IFNAMSIZ];
+       char                    oifname[IFNAMSIZ];
        struct rcu_head         rcu;
+       struct net *            fr_net;
 };
 
-struct fib_lookup_arg
-{
+struct fib_lookup_arg {
        void                    *lookup_ptr;
        void                    *result;
        struct fib_rule         *rule;
 };
 
-struct fib_rules_ops
-{
+struct fib_rules_ops {
        int                     family;
        struct list_head        list;
        int                     rule_size;
@@ -47,30 +47,31 @@ struct fib_rules_ops
                                         struct flowi *, int);
        int                     (*configure)(struct fib_rule *,
                                             struct sk_buff *,
-                                            struct nlmsghdr *,
                                             struct fib_rule_hdr *,
                                             struct nlattr **);
        int                     (*compare)(struct fib_rule *,
                                           struct fib_rule_hdr *,
                                           struct nlattr **);
        int                     (*fill)(struct fib_rule *, struct sk_buff *,
-                                       struct nlmsghdr *,
                                        struct fib_rule_hdr *);
        u32                     (*default_pref)(struct fib_rules_ops *ops);
        size_t                  (*nlmsg_payload)(struct fib_rule *);
 
        /* Called after modifications to the rules set, must flush
         * the route cache if one exists. */
-       void                    (*flush_cache)(void);
+       void                    (*flush_cache)(struct fib_rules_ops *ops);
 
        int                     nlgroup;
        const struct nla_policy *policy;
        struct list_head        rules_list;
        struct module           *owner;
+       struct net              *fro_net;
+       struct rcu_head         rcu;
 };
 
 #define FRA_GENERIC_POLICY \
-       [FRA_IFNAME]    = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \
+       [FRA_IIFNAME]   = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \
+       [FRA_OIFNAME]   = { .type = NLA_STRING, .len = IFNAMSIZ - 1 }, \
        [FRA_PRIORITY]  = { .type = NLA_U32 }, \
        [FRA_FWMARK]    = { .type = NLA_U32 }, \
        [FRA_FWMASK]    = { .type = NLA_U32 }, \
@@ -85,6 +86,7 @@ static inline void fib_rule_get(struct fib_rule *rule)
 static inline void fib_rule_put_rcu(struct rcu_head *head)
 {
        struct fib_rule *rule = container_of(head, struct fib_rule, rcu);
+       release_net(rule->fr_net);
        kfree(rule);
 }
 
@@ -101,8 +103,8 @@ static inline u32 frh_get_table(struct fib_rule_hdr *frh, struct nlattr **nla)
        return frh->table;
 }
 
-extern int fib_rules_register(struct net *, struct fib_rules_ops *);
-extern void fib_rules_unregister(struct net *, struct fib_rules_ops *);
+extern struct fib_rules_ops *fib_rules_register(struct fib_rules_ops *, struct net *);
+extern void fib_rules_unregister(struct fib_rules_ops *);
 extern void                     fib_rules_cleanup_ops(struct fib_rules_ops *);
 
 extern int                     fib_rules_lookup(struct fib_rules_ops *,