nfsd4: simplify lease/grace interaction

[safe/jmp/linux-2.6] / net / ipv6 / xfrm6_policy.c

diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 4acc308..dbdc696 100644 (file)
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -24,7 +24,6 @@
 #include <net/mip6.h>
 #endif
 
-static struct dst_ops xfrm6_dst_ops;
 static struct xfrm_policy_afinfo xfrm6_policy_afinfo;
 
 static struct dst_entry *xfrm6_dst_lookup(struct net *net, int tos,
@@ -224,8 +223,10 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
 
 static inline int xfrm6_garbage_collect(struct dst_ops *ops)
 {
-       xfrm6_policy_afinfo.garbage_collect(&init_net);
-       return (atomic_read(&xfrm6_dst_ops.entries) > xfrm6_dst_ops.gc_thresh*2);
+       struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
+
+       xfrm6_policy_afinfo.garbage_collect(net);
+       return (atomic_read(&ops->entries) > ops->gc_thresh * 2);
 }
 
 static void xfrm6_update_pmtu(struct dst_entry *dst, u32 mtu)
@@ -306,11 +307,11 @@ static void xfrm6_policy_fini(void)
        xfrm_policy_unregister_afinfo(&xfrm6_policy_afinfo);
 }
 
+#ifdef CONFIG_SYSCTL
 static struct ctl_table xfrm6_policy_table[] = {
        {
-               .ctl_name       = CTL_UNNUMBERED,
                .procname       = "xfrm6_gc_thresh",
-               .data           = &xfrm6_dst_ops.gc_thresh,
+               .data           = &init_net.xfrm.xfrm6_dst_ops.gc_thresh,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
@@ -319,10 +320,26 @@ static struct ctl_table xfrm6_policy_table[] = {
 };
 
 static struct ctl_table_header *sysctl_hdr;
+#endif
 
 int __init xfrm6_init(void)
 {
        int ret;
+       unsigned int gc_thresh;
+
+       /*
+        * We need a good default value for the xfrm6 gc threshold.
+        * In ipv4 we set it to the route hash table size * 8, which
+        * is half the size of the maximaum route cache for ipv4.  It
+        * would be good to do the same thing for v6, except the table is
+        * constructed differently here.  Here each table for a net namespace
+        * can have FIB_TABLE_HASHSZ entries, so lets go with the same
+        * computation that we used for ipv4 here.  Also, lets keep the initial
+        * gc_thresh to a minimum of 1024, since, the ipv6 route cache defaults
+        * to that as a minimum as well
+        */
+       gc_thresh = FIB6_TABLE_HASHSZ * 8;
+       xfrm6_dst_ops.gc_thresh = (gc_thresh < 1024) ? 1024 : gc_thresh;
 
        ret = xfrm6_policy_init();
        if (ret)
@@ -331,8 +348,11 @@ int __init xfrm6_init(void)
        ret = xfrm6_state_init();
        if (ret)
                goto out_policy;
+
+#ifdef CONFIG_SYSCTL
        sysctl_hdr = register_net_sysctl_table(&init_net, net_ipv6_ctl_path,
                                                xfrm6_policy_table);
+#endif
 out:
        return ret;
 out_policy:
@@ -342,8 +362,10 @@ out_policy:
 
 void xfrm6_fini(void)
 {
+#ifdef CONFIG_SYSCTL
        if (sysctl_hdr)
                unregister_net_sysctl_table(sysctl_hdr);
+#endif
        //xfrm6_input_fini();
        xfrm6_policy_fini();
        xfrm6_state_fini();