1 files changed, 8 insertions, 14 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index 453c79d0915b..43fc3fa50d62 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -905,16 +905,6 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb)
 }
 
 /**
- *      sk_filter_rcu_free: Free a socket filter
- *      @rcu: rcu_head that contains the sk_filter to free
- */
-static inline void sk_filter_rcu_free(struct rcu_head *rcu)
-{
-        struct sk_filter *fp = container_of(rcu, struct sk_filter, rcu);
-        kfree(fp);
-}
-
-/**
  *      sk_filter_release: Release a socket filter
  *      @sk: socket
  *      @fp: filter to remove
@@ -922,14 +912,18 @@ static inline void sk_filter_rcu_free(struct rcu_head *rcu)
  *      Remove a filter from a socket and release its resources.
  */
 
-static inline void sk_filter_release(struct sock *sk, struct sk_filter *fp)
+static inline void sk_filter_release(struct sk_filter *fp)
+{
+        if (atomic_dec_and_test(&fp->refcnt))
+                kfree(fp);
+}
+
+static inline void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp)
 {
         unsigned int size = sk_filter_len(fp);
 
         atomic_sub(size, &sk->sk_omem_alloc);
-
-        if (atomic_dec_and_test(&fp->refcnt))
-                call_rcu_bh(&fp->rcu, sk_filter_rcu_free);
+        sk_filter_release(fp);
 }
 
 static inline void sk_filter_charge(struct sock *sk, struct sk_filter *fp)