patch-2.0.35 linux/net/ipv4/route.c

• Lines: 56
• Date: Mon Jul 13 13:47:41 1998
• Orig file: v2.0.34/linux/net/ipv4/route.c
• Orig date: Mon Jul 13 13:46:43 1998

diff -u --recursive --new-file v2.0.34/linux/net/ipv4/route.c linux/net/ipv4/route.c
@@ -925,6 +925,15 @@
 static __inline__ void rt_kick_free_queue(void)
 {
 	struct rtable *rt, **rtp;
+#if RT_CACHE_DEBUG >= 2
+	static int in = 0;
+
+	if(in) {
+		printk("Attempted multiple entry: rt_kick_free_queue\n");
+		return;
+	}
+	in++;
+#endif
 
 	ip_rt_bh_mask &= ~RT_BH_FREE;
 
@@ -952,6 +961,9 @@
 		}
 		rtp = &rt->rt_next;
 	}
+#if RT_CACHE_DEBUG >= 2
+	in--;
+#endif
 }
 
 void ip_rt_run_bh()
@@ -974,8 +986,11 @@
 			ip_rt_fast_unlock();
 		}
 
-		if (ip_rt_bh_mask & RT_BH_FREE)
+		if (ip_rt_bh_mask & RT_BH_FREE) {
+			ip_rt_fast_lock();
 			rt_kick_free_queue();
+			ip_rt_fast_unlock();
+		}
 	}
 	restore_flags(flags);
 }
@@ -1528,12 +1543,10 @@
 
 void ip_rt_put(struct rtable * rt)
 {
-	if (rt)
-		atomic_dec(&rt->rt_refcnt);
-	
-	/* If this rtable entry is not in the cache, we'd better free it once the
-	 * refcnt goes to zero, because nobody else will... */
-	if ( rt && (rt->rt_flags & RTF_NOTCACHED) && (!rt->rt_refcnt) )
+	/* If this rtable entry is not in the cache, we'd better free
+	 * it once the refcnt goes to zero, because nobody else will.
+	 */
+	if (rt&&atomic_dec_and_test(&rt->rt_refcnt)&&(rt->rt_flags&RTF_NOTCACHED))
 		rt_free(rt);
 }