kevin/linux
1
Fork 0
Code

ipv4: delete redundant judgment statements

Browse Source 
The initial value of err is -ENOBUFS, and err is guaranteed to be
less than 0 before all goto errout. Therefore, on the error path
of errout, there is no need to repeatedly judge that err is less than 0,
and delete redundant judgments to make the code more concise.

Signed-off-by: Li Zetao <lizetao1@huawei.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Li Zetao 2024-08-22 12:32:47 +08:00 committed by David S. Miller
parent 2d522384fb
commit 4c18088777
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/devinet.c
View File

@ -1943,8 +1943,7 @@ static void rtmsg_ifa(int event, struct in_ifaddr *ifa, struct nlmsghdr *nlh,
rtnl_notify(skb, net, portid, RTNLGRP_IPV4_IFADDR, nlh, GFP_KERNEL); rtnl_notify(skb, net, portid, RTNLGRP_IPV4_IFADDR, nlh, GFP_KERNEL);
return; return;
errout: errout:
if (err < 0) rtnl_set_sk_err(net, RTNLGRP_IPV4_IFADDR, err);
rtnl_set_sk_err(net, RTNLGRP_IPV4_IFADDR, err);
} }
static size_t inet_get_link_af_size(const struct net_device *dev, static size_t inet_get_link_af_size(const struct net_device *dev,
@ -2140,8 +2139,7 @@ void inet_netconf_notify_devconf(struct net *net, int event, int type,
rtnl_notify(skb, net, 0, RTNLGRP_IPV4_NETCONF, NULL, GFP_KERNEL); rtnl_notify(skb, net, 0, RTNLGRP_IPV4_NETCONF, NULL, GFP_KERNEL);
return; return;
errout: errout:
if (err < 0) rtnl_set_sk_err(net, RTNLGRP_IPV4_NETCONF, err);
rtnl_set_sk_err(net, RTNLGRP_IPV4_NETCONF, err);
} }
static const struct nla_policy devconf_ipv4_policy[NETCONFA_MAX+1] = { static const struct nla_policy devconf_ipv4_policy[NETCONFA_MAX+1] = {

3
net/ipv4/fib_semantics.c
View File

@ -543,8 +543,7 @@ void rtmsg_fib(int event, __be32 key, struct fib_alias *fa,
info->nlh, GFP_KERNEL); info->nlh, GFP_KERNEL);
return; return;
errout: errout:
if (err < 0) rtnl_set_sk_err(info->nl_net, RTNLGRP_IPV4_ROUTE, err);
rtnl_set_sk_err(info->nl_net, RTNLGRP_IPV4_ROUTE, err);
} }
static int fib_detect_death(struct fib_info *fi, int order, static int fib_detect_death(struct fib_info *fi, int order,