From patchwork Tue Dec 17 07:29:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yingliang X-Patchwork-Id: 302038 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6DD872C00A4 for ; Tue, 17 Dec 2013 18:29:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752685Ab3LQH3x (ORCPT ); Tue, 17 Dec 2013 02:29:53 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:20400 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752360Ab3LQH3w (ORCPT ); Tue, 17 Dec 2013 02:29:52 -0500 Received: from 172.24.2.119 (EHLO szxeml205-edg.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id AHW93860; Tue, 17 Dec 2013 15:29:38 +0800 (CST) Received: from SZXEML401-HUB.china.huawei.com (10.82.67.31) by szxeml205-edg.china.huawei.com (172.24.2.58) with Microsoft SMTP Server (TLS) id 14.3.158.1; Tue, 17 Dec 2013 15:29:18 +0800 Received: from localhost (10.135.68.218) by szxeml401-hub.china.huawei.com (10.82.67.31) with Microsoft SMTP Server id 14.3.158.1; Tue, 17 Dec 2013 15:29:18 +0800 From: Yang Yingliang To: , Subject: [PATCH net-next 1/2] act_police: remove unnecessary null pointer check Date: Tue, 17 Dec 2013 15:29:16 +0800 Message-ID: <1387265357-19352-2-git-send-email-yangyingliang@huawei.com> X-Mailer: git-send-email 1.8.1.msysgit.1 In-Reply-To: <1387265357-19352-1-git-send-email-yangyingliang@huawei.com> References: <1387265357-19352-1-git-send-email-yangyingliang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.135.68.218] X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It already has a NULL pointer check of rtab in qdisc_put_rtab(). Remove the check outside of qdisc_put_rtab(). Signed-off-by: Yang Yingliang --- net/sched/act_police.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/sched/act_police.c b/net/sched/act_police.c index 16a62c3..cf01c97 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c @@ -277,10 +277,8 @@ override: failure_unlock: spin_unlock_bh(&police->tcf_lock); failure: - if (P_tab) - qdisc_put_rtab(P_tab); - if (R_tab) - qdisc_put_rtab(R_tab); + qdisc_put_rtab(P_tab); + qdisc_put_rtab(R_tab); if (ret == ACT_P_CREATED) kfree(police); return err;