From patchwork Fri Jan 6 01:49:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?6auY5bOw?= X-Patchwork-Id: 711631 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tvnkn3kGvz9sfH for ; Fri, 6 Jan 2017 12:58:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753603AbdAFB6H (ORCPT ); Thu, 5 Jan 2017 20:58:07 -0500 Received: from SMTPBG19.QQ.COM ([183.60.61.236]:41095 "EHLO smtpbg320.qq.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753586AbdAFB6G (ORCPT ); Thu, 5 Jan 2017 20:58:06 -0500 X-Greylist: delayed 443 seconds by postgrey-1.27 at vger.kernel.org; Thu, 05 Jan 2017 20:58:06 EST X-QQ-mid: bizesmtp14t1483667398t5hcoq6c Received: from ikuai-dev.ikuai8.com (unknown [123.56.230.35]) by esmtp4.qq.com (ESMTP) with id ; Fri, 06 Jan 2017 09:49:50 +0800 (CST) X-QQ-SSF: 01400000002000F0FI40B00A0000000 X-QQ-FEAT: DmppX8963163yS5702/64HJn/AYKs0yENnpcvzGSrmiYAUMG4P0pXHbaaQkp4 gQ8D23TANnNMqhNzU6emjB7NP1TQBekKDMSh5NakoSEDjrfTqb1eO86QiffjvNZLW5d9r3Y VUJnDgaaZXsNlYdDK9fr1HrX2+raGavVf1IruuwwQ3qoMU+6mz8+/uRVRQiG0/+NCT+DrVe M0TMSmF7+NnZZLsT4TslE9FQ1+Q7RoEn9xWQyw1jGJpy7Q0F8x4EYk+jeMRu2kI3hBfA3k3 gyfg== X-QQ-GoodBg: 2 From: fgao@ikuai8.com To: pablo@netfilter.org, netfilter-devel@vger.kernel.org Cc: gfree.wind@gmail.com, Gao Feng Subject: [PATCH nf-next 1/1] netfilter: nf_tables: Remove one useless condition check in nf_tables_newobj Date: Fri, 6 Jan 2017 09:49:48 +0800 Message-Id: <1483667388-30814-1-git-send-email-fgao@ikuai8.com> X-Mailer: git-send-email 1.9.1 X-QQ-SENDSIZE: 520 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Gao Feng The return value of nf_tables_obj_lookup is valid pointer or one error. There are two cases in nf_tables_newobj totally. case1: return value is -ENOENT, the obj is NULL, it is unnecessary to perform the latter check "obj != NULL". case2: IS_ERR(obj) is false, the obj is one valid pointer. It is also unnecessary to perform that check. In summary, we could move the block of condition check "obj != NULL" in the else block to erase the original condition check. Signed-off-by: Gao Feng --- net/netfilter/nf_tables_api.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index a019a87..bc55086 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -4154,9 +4154,7 @@ static int nf_tables_newobj(struct net *net, struct sock *nlsk, return err; obj = NULL; - } - - if (obj != NULL) { + } else { if (nlh->nlmsg_flags & NLM_F_EXCL) return -EEXIST;