netfilter: Let nf_ct_kill() callers know if del_timer() returned true.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index d5d76ec7abb0f3339fc3f65d7218142eeb2bf95e..8f5b75734dd03693752d998c222670c826fbdd00 100644 (file)
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -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. */

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 212a0888408d01c9d11fd5894083ca5ad882e21a..28d03e64200b60284d196bfba395ea90d2316f7f 100644 (file)
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -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);