diff options
| author | Enrico Weigelt <info@metux.net> | 2020-10-12 13:24:49 -0700 |
|---|---|---|
| committer | Ilya Maximets <i.maximets@ovn.org> | 2020-10-17 17:32:06 +0200 |
| commit | fa764e8fb10cb02e602a79e0951456f8000e01f4 (patch) | |
| tree | 695ce0e097927fb819571a3b6b99673526c365a9 /datapath | |
| parent | 5821a592a4d73ea3466d5b2b051181c6e71d3c8a (diff) | |
| download | openvswitch-fa764e8fb10cb02e602a79e0951456f8000e01f4.tar.gz | |
datapath: drop unneeded likely() call around IS_ERR()
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>
Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/datapath.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |