From patchwork Fri Apr 18 17:34:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Guy Briggs X-Patchwork-Id: 340390 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 48144140103 for ; Sat, 19 Apr 2014 03:37:07 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754397AbaDRRfX (ORCPT ); Fri, 18 Apr 2014 13:35:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53855 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753011AbaDRRfN (ORCPT ); Fri, 18 Apr 2014 13:35:13 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3IHZA9T016744 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 18 Apr 2014 13:35:10 -0400 Received: from madcap2.tricolour.ca (vpn-62-122.rdu2.redhat.com [10.10.62.122]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3IHZ6Ap008097; Fri, 18 Apr 2014 13:35:08 -0400 From: Richard Guy Briggs To: linux-audit@redhat.com, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, selinux@tycho.nsa.gov, linux-security-module@vger.kernel.org Cc: Richard Guy Briggs , davem@davemloft.net, eparis@redhat.com, netfilter-devel@vger.kernel.org, hadi@mojatatu.com, sgrubb@redhat.com Subject: [PATCH 1/6] netlink: simplify nfnetlink_bind Date: Fri, 18 Apr 2014 13:34:05 -0400 Message-Id: <8ae3bd558cb6619428cc40e467d1643f9d382a0a.1397831970.git.rgb@redhat.com> In-Reply-To: <20140324183406.GE28666@madcap2.tricolour.ca> References: <20140324183406.GE28666@madcap2.tricolour.ca> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove duplicity and simplify code flow by moving the rcu_read_unlock() above the condition and let the flow control exit naturally at the end of the function. Signed-off-by: Richard Guy Briggs --- net/netfilter/nfnetlink.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index e8138da..0df800a 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -407,12 +407,9 @@ static void nfnetlink_bind(int group) rcu_read_lock(); ss = nfnetlink_get_subsys(type); - if (!ss) { - rcu_read_unlock(); - request_module("nfnetlink-subsys-%d", type); - return; - } rcu_read_unlock(); + if (!ss) + request_module("nfnetlink-subsys-%d", type); } #endif