Message ID | 20200916173311.30956-3-gvrose8192@gmail.com |
---|---|
State | Changes Requested |
Headers | show |
Series | Add support for Linux kernels up to 5.8.x | expand |
On Wed, Sep 16, 2020 at 10:33 AM Greg Rose <gvrose8192@gmail.com> wrote: > > From: Enrico Weigelt <info@metux.net> > > Upstream commit: > commit b90f5aa4d6268e81dd1fd51e5ef89d2892bf040d > Author: Enrico Weigelt <info@metux.net> > Date: Wed Jun 5 23:06:40 2019 +0200 > > net: openvswitch: drop unneeded likely() call around IS_ERR() > > IS_ERR() already calls unlikely(), so this extra likely() call > around the !IS_ERR() is not needed. > > Signed-off-by: Enrico Weigelt <info@metux.net> > Signed-off-by: David S. Miller <davem@davemloft.net> > > Cc: Enrico Weigelt <info@metux.net> > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > --- Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
diff --git a/datapath/datapath.c b/datapath/datapath.c index d604bfd36..4c485c88a 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -1402,7 +1402,7 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info) &flow->id, info, false, ufid_flags); if (likely(reply)) { - if (likely(!IS_ERR(reply))) { + if (!IS_ERR(reply)) { rcu_read_lock(); /*To keep RCU checker happy. */ err = ovs_flow_cmd_fill_info(flow, ovs_header->dp_ifindex, reply, info->snd_portid,