From: Gao Feng Date: Thu, 21 Jul 2016 23:55:41 +0000 (+0800) Subject: ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL X-Git-Tag: v4.10-rc1~202^2~53^2~42^2~1 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fe24a0c3a974f15945639edfc19f6b85f672145c;p=linux.git ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL This minor refactoring does not change the logic of function ip_vs_genl_dump_dests. Signed-off-by: Gao Feng Acked-by: Julian Anastasov Signed-off-by: Simon Horman --- diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 6b85ded4f91d..217e0105b5e0 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -3260,7 +3260,7 @@ static int ip_vs_genl_dump_dests(struct sk_buff *skb, svc = ip_vs_genl_find_service(ipvs, attrs[IPVS_CMD_ATTR_SERVICE]); - if (IS_ERR(svc) || svc == NULL) + if (IS_ERR_OR_NULL(svc)) goto out_err; /* Dump the destinations */