From: Colin Ian King <colin.king@canonical.com>
Date: Wed, 3 May 2017 13:50:40 +0000 (+0100)
Subject: net/sched: remove redundant null check on head
X-Git-Tag: Ubuntu-4.12.0-11.12~1194^2~7
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=985538eee06f169bb13c7ecb1a7fcdeb700b05c7;p=mirror_ubuntu-artful-kernel.git

net/sched: remove redundant null check on head

head is previously null checked and so the 2nd null check on head
is redundant and therefore can be removed.

Detected by CoverityScan, CID#1399505 ("Logically dead code")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index 2efb36c08f2a..dee469fed967 100644
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -203,8 +203,7 @@ static int mall_change(struct net *net, struct sk_buff *in_skb,
 
 	*arg = (unsigned long) head;
 	rcu_assign_pointer(tp->root, new);
-	if (head)
-		call_rcu(&head->rcu, mall_destroy_rcu);
+	call_rcu(&head->rcu, mall_destroy_rcu);
 	return 0;
 
 err_replace_hw_filter: