netfilter: Let nf_ct_kill() callers know if del_timer() returned true.
David S. Miller [Tue, 15 Jul 2008 03:22:38 +0000 (20:22 -0700)]
Signed-off-by: David S. Miller <davem@davemloft.net>

include/net/netfilter/nf_conntrack.h
net/netfilter/nf_conntrack_core.c

index d5d76ec..8f5b757 100644 (file)
@@ -223,23 +223,23 @@ static inline void nf_ct_refresh(struct nf_conn *ct,
        __nf_ct_refresh_acct(ct, 0, skb, extra_jiffies, 0);
 }
 
-extern void __nf_ct_kill_acct(struct nf_conn *ct,
-                               enum ip_conntrack_info ctinfo,
-                               const struct sk_buff *skb,
-                               int do_acct);
+extern bool __nf_ct_kill_acct(struct nf_conn *ct,
+                             enum ip_conntrack_info ctinfo,
+                             const struct sk_buff *skb,
+                             int do_acct);
 
 /* kill conntrack and do accounting */
-static inline void nf_ct_kill_acct(struct nf_conn *ct,
-                               enum ip_conntrack_info ctinfo,
-                               const struct sk_buff *skb)
+static inline bool nf_ct_kill_acct(struct nf_conn *ct,
+                                  enum ip_conntrack_info ctinfo,
+                                  const struct sk_buff *skb)
 {
-       __nf_ct_kill_acct(ct, ctinfo, skb, 1);
+       return __nf_ct_kill_acct(ct, ctinfo, skb, 1);
 }
 
 /* kill conntrack without accounting */
-static inline void nf_ct_kill(struct nf_conn *ct)
+static inline bool nf_ct_kill(struct nf_conn *ct)
 {
-       __nf_ct_kill_acct(ct, 0, NULL, 0);
+       return __nf_ct_kill_acct(ct, 0, NULL, 0);
 }
 
 /* These are for NAT.  Icky. */
index 212a088..28d03e6 100644 (file)
@@ -848,10 +848,10 @@ acct:
 }
 EXPORT_SYMBOL_GPL(__nf_ct_refresh_acct);
 
-void __nf_ct_kill_acct(struct nf_conn *ct,
-               enum ip_conntrack_info ctinfo,
-               const struct sk_buff *skb,
-               int do_acct)
+bool __nf_ct_kill_acct(struct nf_conn *ct,
+                      enum ip_conntrack_info ctinfo,
+                      const struct sk_buff *skb,
+                      int do_acct)
 {
 #ifdef CONFIG_NF_CT_ACCT
        if (do_acct) {
@@ -862,8 +862,11 @@ void __nf_ct_kill_acct(struct nf_conn *ct,
                spin_unlock_bh(&nf_conntrack_lock);
        }
 #endif
-       if (del_timer(&ct->timeout))
+       if (del_timer(&ct->timeout)) {
                ct->timeout.function((unsigned long)ct);
+               return true;
+       }
+       return false;
 }
 EXPORT_SYMBOL_GPL(__nf_ct_kill_acct);