| From foo@baz Mon Sep 17 13:33:56 CEST 2018 |
| From: Stephen Hemminger <stephen@networkplumber.org> |
| Date: Thu, 13 Sep 2018 07:58:44 -0700 |
| Subject: inet: frags: remove inet_frag_maybe_warn_overflow() |
| To: davem@davemloft.net, gregkh@linuxfoundation.org |
| Cc: netdev@vger.kernel.org, stable@vger.kernel.org, edumazet@google.com |
| Message-ID: <20180913145902.17531-13-sthemmin@microsoft.com> |
| |
| From: Eric Dumazet <edumazet@google.com> |
| |
| This function is obsolete, after rhashtable addition to inet defrag. |
| |
| Signed-off-by: Eric Dumazet <edumazet@google.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 2d44ed22e607f9a285b049de2263e3840673a260) |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| include/net/inet_frag.h | 2 -- |
| net/ieee802154/6lowpan/reassembly.c | 5 ++--- |
| net/ipv4/inet_fragment.c | 11 ----------- |
| net/ipv4/ip_fragment.c | 5 ++--- |
| net/ipv6/netfilter/nf_conntrack_reasm.c | 5 ++--- |
| net/ipv6/reassembly.c | 5 ++--- |
| 6 files changed, 8 insertions(+), 25 deletions(-) |
| |
| --- a/include/net/inet_frag.h |
| +++ b/include/net/inet_frag.h |
| @@ -110,8 +110,6 @@ void inet_frags_exit_net(struct netns_fr |
| void inet_frag_kill(struct inet_frag_queue *q); |
| void inet_frag_destroy(struct inet_frag_queue *q); |
| struct inet_frag_queue *inet_frag_find(struct netns_frags *nf, void *key); |
| -void inet_frag_maybe_warn_overflow(struct inet_frag_queue *q, |
| - const char *prefix); |
| |
| static inline void inet_frag_put(struct inet_frag_queue *q) |
| { |
| --- a/net/ieee802154/6lowpan/reassembly.c |
| +++ b/net/ieee802154/6lowpan/reassembly.c |
| @@ -84,10 +84,9 @@ fq_find(struct net *net, const struct lo |
| struct inet_frag_queue *q; |
| |
| q = inet_frag_find(&ieee802154_lowpan->frags, &key); |
| - if (IS_ERR_OR_NULL(q)) { |
| - inet_frag_maybe_warn_overflow(q, pr_fmt()); |
| + if (!q) |
| return NULL; |
| - } |
| + |
| return container_of(q, struct lowpan_frag_queue, q); |
| } |
| |
| --- a/net/ipv4/inet_fragment.c |
| +++ b/net/ipv4/inet_fragment.c |
| @@ -218,14 +218,3 @@ struct inet_frag_queue *inet_frag_find(s |
| return inet_frag_create(nf, key); |
| } |
| EXPORT_SYMBOL(inet_frag_find); |
| - |
| -void inet_frag_maybe_warn_overflow(struct inet_frag_queue *q, |
| - const char *prefix) |
| -{ |
| - static const char msg[] = "inet_frag_find: Fragment hash bucket" |
| - " list length grew over limit. Dropping fragment.\n"; |
| - |
| - if (PTR_ERR(q) == -ENOBUFS) |
| - net_dbg_ratelimited("%s%s", prefix, msg); |
| -} |
| -EXPORT_SYMBOL(inet_frag_maybe_warn_overflow); |
| --- a/net/ipv4/ip_fragment.c |
| +++ b/net/ipv4/ip_fragment.c |
| @@ -221,10 +221,9 @@ static struct ipq *ip_find(struct net *n |
| struct inet_frag_queue *q; |
| |
| q = inet_frag_find(&net->ipv4.frags, &key); |
| - if (IS_ERR_OR_NULL(q)) { |
| - inet_frag_maybe_warn_overflow(q, pr_fmt()); |
| + if (!q) |
| return NULL; |
| - } |
| + |
| return container_of(q, struct ipq, q); |
| } |
| |
| --- a/net/ipv6/netfilter/nf_conntrack_reasm.c |
| +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c |
| @@ -178,10 +178,9 @@ static struct frag_queue *fq_find(struct |
| struct inet_frag_queue *q; |
| |
| q = inet_frag_find(&net->nf_frag.frags, &key); |
| - if (IS_ERR_OR_NULL(q)) { |
| - inet_frag_maybe_warn_overflow(q, pr_fmt()); |
| + if (!q) |
| return NULL; |
| - } |
| + |
| return container_of(q, struct frag_queue, q); |
| } |
| |
| --- a/net/ipv6/reassembly.c |
| +++ b/net/ipv6/reassembly.c |
| @@ -155,10 +155,9 @@ fq_find(struct net *net, __be32 id, cons |
| key.iif = 0; |
| |
| q = inet_frag_find(&net->ipv6.frags, &key); |
| - if (IS_ERR_OR_NULL(q)) { |
| - inet_frag_maybe_warn_overflow(q, pr_fmt()); |
| + if (!q) |
| return NULL; |
| - } |
| + |
| return container_of(q, struct frag_queue, q); |
| } |
| |