net: ipv4: drop unneeded likely() call around IS_ERR()

IS_ERR() already calls unlikely(), so this extra unlikely() call
around IS_ERR() is not needed.

Signed-off-by: Enrico Weigelt <info@metux.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 01e587a5dcb1db77660be27ef8d16bc4e893eed3..4282bdcacf96d6162b87cba73920194032f10229 100644 (file)
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -1341,7 +1341,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg,
                goto failure;
        fi->fib_metrics = ip_fib_metrics_init(fi->fib_net, cfg->fc_mx,
                                              cfg->fc_mx_len, extack);
-       if (unlikely(IS_ERR(fi->fib_metrics))) {
+       if (IS_ERR(fi->fib_metrics)) {
                err = PTR_ERR(fi->fib_metrics);
                kfree(fi);
                return ERR_PTR(err);

diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 942265d65eb3741a6350ff685cba915538960ea5..af28f332ba89b6537e4a7510e0c24b1d27953a35 100644 (file)
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -320,7 +320,7 @@ struct sock *__inet_lookup_listener(struct net *net,
                                    saddr, sport, htonl(INADDR_ANY), hnum,
                                    dif, sdif);
 done:
-       if (unlikely(IS_ERR(result)))
+       if (IS_ERR(result))
                return NULL;
        return result;
 }

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 8fb250ed53d486f26e08faf4a00dde4c11d26a2c..f40059b2a8a080fb1f7736a41b0eb8c7872f817f 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -483,7 +483,7 @@ struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr,
                                          htonl(INADDR_ANY), hnum, dif, sdif,
                                          exact_dif, hslot2, skb);
        }
-       if (unlikely(IS_ERR(result)))
+       if (IS_ERR(result))
                return NULL;
        return result;
 }

diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 065334b41d575aa0ba28de8487a6a5d018ec8804..f1c46df279e8b4509bb86b1cb242393b479b20e7 100644 (file)
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -212,7 +212,7 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,
                gso_skb->destructor = NULL;
 
        segs = skb_segment(gso_skb, features);
-       if (unlikely(IS_ERR_OR_NULL(segs))) {
+       if (IS_ERR_OR_NULL(segs)) {
                if (copy_dtor)
                        gso_skb->destructor = sock_wfree;
                return segs;