tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'net-redundant-judgments'

Li Zetao says:

====================
net: Delete some redundant judgments

This patchset aims to remove some unnecessary judgments and make the
code more concise. In some network modules, rtnl_set_sk_err is used to
record error information, but the err is repeatedly judged to be less
than 0 on the error path. Deleted these redundant judgments.

No functional change intended.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller f9db28bb b34a6e73

+15 -30
+1 -2
drivers/net/vxlan/vxlan_core.c
··· 277 277 rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC); 278 278 return; 279 279 errout: 280 - if (err < 0) 281 - rtnl_set_sk_err(net, RTNLGRP_NEIGH, err); 280 + rtnl_set_sk_err(net, RTNLGRP_NEIGH, err); 282 281 } 283 282 284 283 static void vxlan_fdb_switchdev_notifier_info(const struct vxlan_dev *vxlan,
+1 -2
net/core/fib_rules.c
··· 1205 1205 rtnl_notify(skb, net, pid, ops->nlgroup, nlh, GFP_KERNEL); 1206 1206 return; 1207 1207 errout: 1208 - if (err < 0) 1209 - rtnl_set_sk_err(net, ops->nlgroup, err); 1208 + rtnl_set_sk_err(net, ops->nlgroup, err); 1210 1209 } 1211 1210 1212 1211 static void attach_rules(struct list_head *rules, struct net_device *dev)
+1 -2
net/core/neighbour.c
··· 3530 3530 rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC); 3531 3531 return; 3532 3532 errout: 3533 - if (err < 0) 3534 - rtnl_set_sk_err(net, RTNLGRP_NEIGH, err); 3533 + rtnl_set_sk_err(net, RTNLGRP_NEIGH, err); 3535 3534 } 3536 3535 3537 3536 void neigh_app_ns(struct neighbour *n)
+1 -2
net/core/rtnetlink.c
··· 4087 4087 } 4088 4088 return skb; 4089 4089 errout: 4090 - if (err < 0) 4091 - rtnl_set_sk_err(net, RTNLGRP_LINK, err); 4090 + rtnl_set_sk_err(net, RTNLGRP_LINK, err); 4092 4091 return NULL; 4093 4092 } 4094 4093
+2 -4
net/ipv4/devinet.c
··· 1943 1943 rtnl_notify(skb, net, portid, RTNLGRP_IPV4_IFADDR, nlh, GFP_KERNEL); 1944 1944 return; 1945 1945 errout: 1946 - if (err < 0) 1947 - rtnl_set_sk_err(net, RTNLGRP_IPV4_IFADDR, err); 1946 + rtnl_set_sk_err(net, RTNLGRP_IPV4_IFADDR, err); 1948 1947 } 1949 1948 1950 1949 static size_t inet_get_link_af_size(const struct net_device *dev, ··· 2139 2140 rtnl_notify(skb, net, 0, RTNLGRP_IPV4_NETCONF, NULL, GFP_KERNEL); 2140 2141 return; 2141 2142 errout: 2142 - if (err < 0) 2143 - rtnl_set_sk_err(net, RTNLGRP_IPV4_NETCONF, err); 2143 + rtnl_set_sk_err(net, RTNLGRP_IPV4_NETCONF, err); 2144 2144 } 2145 2145 2146 2146 static const struct nla_policy devconf_ipv4_policy[NETCONFA_MAX+1] = {
+1 -2
net/ipv4/fib_semantics.c
··· 543 543 info->nlh, GFP_KERNEL); 544 544 return; 545 545 errout: 546 - if (err < 0) 547 - rtnl_set_sk_err(info->nl_net, RTNLGRP_IPV4_ROUTE, err); 546 + rtnl_set_sk_err(info->nl_net, RTNLGRP_IPV4_ROUTE, err); 548 547 } 549 548 550 549 static int fib_detect_death(struct fib_info *fi, int order,
+1 -2
net/ipv4/ipmr.c
··· 2407 2407 2408 2408 errout: 2409 2409 kfree_skb(skb); 2410 - if (err < 0) 2411 - rtnl_set_sk_err(net, RTNLGRP_IPV4_MROUTE, err); 2410 + rtnl_set_sk_err(net, RTNLGRP_IPV4_MROUTE, err); 2412 2411 } 2413 2412 2414 2413 static size_t igmpmsg_netlink_msgsize(size_t payloadlen)
+2 -4
net/ipv4/nexthop.c
··· 1090 1090 info->nlh, gfp_any()); 1091 1091 return; 1092 1092 errout: 1093 - if (err < 0) 1094 - rtnl_set_sk_err(info->nl_net, RTNLGRP_NEXTHOP, err); 1093 + rtnl_set_sk_err(info->nl_net, RTNLGRP_NEXTHOP, err); 1095 1094 } 1096 1095 1097 1096 static unsigned long nh_res_bucket_used_time(const struct nh_res_bucket *bucket) ··· 1210 1211 rtnl_notify(skb, nh->net, 0, RTNLGRP_NEXTHOP, NULL, GFP_KERNEL); 1211 1212 return; 1212 1213 errout: 1213 - if (err < 0) 1214 - rtnl_set_sk_err(nh->net, RTNLGRP_NEXTHOP, err); 1214 + rtnl_set_sk_err(nh->net, RTNLGRP_NEXTHOP, err); 1215 1215 } 1216 1216 1217 1217 static bool valid_group_nh(struct nexthop *nh, unsigned int npaths,
+1 -2
net/ipv6/ip6mr.c
··· 2431 2431 2432 2432 errout: 2433 2433 kfree_skb(skb); 2434 - if (err < 0) 2435 - rtnl_set_sk_err(net, RTNLGRP_IPV6_MROUTE, err); 2434 + rtnl_set_sk_err(net, RTNLGRP_IPV6_MROUTE, err); 2436 2435 } 2437 2436 2438 2437 static size_t mrt6msg_netlink_msgsize(size_t payloadlen)
+2 -4
net/ipv6/route.c
··· 6193 6193 info->nlh, gfp_any()); 6194 6194 return; 6195 6195 errout: 6196 - if (err < 0) 6197 - rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err); 6196 + rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err); 6198 6197 } 6199 6198 6200 6199 void fib6_rt_update(struct net *net, struct fib6_info *rt, ··· 6219 6220 info->nlh, gfp_any()); 6220 6221 return; 6221 6222 errout: 6222 - if (err < 0) 6223 - rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err); 6223 + rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err); 6224 6224 } 6225 6225 6226 6226 void fib6_info_hw_flags_set(struct net *net, struct fib6_info *f6i,
+2 -4
net/mpls/af_mpls.c
··· 1201 1201 rtnl_notify(skb, net, 0, RTNLGRP_MPLS_NETCONF, NULL, GFP_KERNEL); 1202 1202 return; 1203 1203 errout: 1204 - if (err < 0) 1205 - rtnl_set_sk_err(net, RTNLGRP_MPLS_NETCONF, err); 1204 + rtnl_set_sk_err(net, RTNLGRP_MPLS_NETCONF, err); 1206 1205 } 1207 1206 1208 1207 static const struct nla_policy devconf_mpls_policy[NETCONFA_MAX + 1] = { ··· 2277 2278 2278 2279 return; 2279 2280 errout: 2280 - if (err < 0) 2281 - rtnl_set_sk_err(net, RTNLGRP_MPLS_ROUTE, err); 2281 + rtnl_set_sk_err(net, RTNLGRP_MPLS_ROUTE, err); 2282 2282 } 2283 2283 2284 2284 static int mpls_valid_getroute_req(struct sk_buff *skb,