From patchwork Tue Nov 15 22:48:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 695320 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 3tJMy34FTSz9t1L for ; Wed, 16 Nov 2016 09:48:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=bytheb-org.20150623.gappssmtp.com header.i=@bytheb-org.20150623.gappssmtp.com header.b="xJCnF7UD"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932927AbcKOWs7 (ORCPT ); Tue, 15 Nov 2016 17:48:59 -0500 Received: from mail-qk0-f194.google.com ([209.85.220.194]:35322 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932797AbcKOWs6 (ORCPT ); Tue, 15 Nov 2016 17:48:58 -0500 Received: by mail-qk0-f194.google.com with SMTP id n204so18684081qke.2 for ; Tue, 15 Nov 2016 14:48:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytheb-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gQphUT2VD8amUvO02cRt8oBnMG/p5L5kIYBawBm8dck=; b=xJCnF7UDnx3HPbjH65yUedPnzRyzNErdkC2W2/vdcBDMeHOcFTN77ZIKFRreAJvUEI MliW/K+NqmrlRgARvgO360egxx+39YJM3CRuaYhGNpVYBt9d6WbKeL1DvsQUa3uFQMrS 7dbNesQqgZ6zJmZdMUKNcT93NiaZl7hpApE+Ilm4WQSKMSs/TJZBKyDTPGq/KJ7JfhhV Y1LENDt4o0KbxkP6fSW6q99sDaFACWdMw5lyXxgNg9YgB0MwHT3GBV+kyxqLy7rDGgx6 99qN2Rik5Ggt+YRhTYOaAfVQGiFp6XR9y0pee6pqXIzAZYsaRV3J2Wk9+M9IDmSDZ9Tv +tBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gQphUT2VD8amUvO02cRt8oBnMG/p5L5kIYBawBm8dck=; b=POapDBdW7FRqPgGJ8BPd2LHPa9V4tCg+2Ory+vhdveYUzSDU5dfQCS+893Ke15ZsBm 8mA0CZuMrDAL1d0Fs0NsuAH9tOkpszqkAhxMY/AKH2WCIltvIiZ6vl5PmWDXpRVPzKg9 0obrEwx0fMyS7eCEI2mHGW9sJv98pc8bFOnODgvBq0ZNzw6hJ09buHTfHEcaQrickc36 E56QDgZ896WnDmUhYIifMEXCdHWAcnp9pXrgJb9uoIkXoUcm9lQF/iIfh+AoZdAKKSWv 4d+4gGhjKuUvdYqcodL/OpQeCVTEzsgA6m+4pLVkGeeyTf/+s7i59Ob49/o63YDkyMD/ MC6w== X-Gm-Message-State: ABUngvfc0OaZ4L2wdsaX6XRB2PE7k7BCWngzU4JuVnh1LREABA1oku+SVywtC/NAq+j7Jw== X-Received: by 10.55.86.196 with SMTP id k187mr28072803qkb.203.1479250137379; Tue, 15 Nov 2016 14:48:57 -0800 (PST) Received: from dhcp-25-97.bos.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id b16sm5349380qkg.41.2016.11.15.14.48.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Nov 2016 14:48:56 -0800 (PST) From: Aaron Conole To: netfilter-devel@vger.kernel.org Cc: Pablo Neira Ayuso , Florian Westphal , Jozsef Kadlecsik , coreteam@netfilter.org, "David S . Miller" Subject: [PATCH nf-next 3/3] netfilter: convert while loops to for loops Date: Tue, 15 Nov 2016 17:48:46 -0500 Message-Id: <1479250126-15111-4-git-send-email-aconole@bytheb.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479250126-15111-1-git-send-email-aconole@bytheb.org> References: <1479250126-15111-1-git-send-email-aconole@bytheb.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This is to facilitate converting from a singly-linked list to an array of elements. Signed-off-by: Aaron Conole --- net/bridge/br_netfilter_hooks.c | 8 ++++---- net/netfilter/core.c | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c index ef8cfa7..1434de1 100644 --- a/net/bridge/br_netfilter_hooks.c +++ b/net/bridge/br_netfilter_hooks.c @@ -1008,10 +1008,10 @@ int br_nf_hook_thresh(unsigned int hook, struct net *net, struct nf_hook_state state; int ret; - elem = rcu_dereference(net->nf.hooks[NFPROTO_BRIDGE][hook]); - - while (elem && (nf_hook_entry_priority(elem) <= NF_BR_PRI_BRNF)) - elem = rcu_dereference(elem->next); + for (elem = rcu_dereference(net->nf.hooks[NFPROTO_BRIDGE][hook]); + nf_hook_entry_priority(elem) <= NF_BR_PRI_BRNF; + elem = rcu_dereference(elem->next)) + ; if (!elem) return okfn(net, sk, skb); diff --git a/net/netfilter/core.c b/net/netfilter/core.c index 2bb46e2..ce6adfa 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -107,10 +107,9 @@ int nf_register_net_hook(struct net *net, const struct nf_hook_ops *reg) mutex_lock(&nf_hook_mutex); /* Find the spot in the list */ - while ((p = nf_entry_dereference(*pp)) != NULL) { + for (; (p = nf_entry_dereference(*pp)) != NULL; pp = &p->next) { if (reg->priority < nf_hook_entry_priority(p)) break; - pp = &p->next; } rcu_assign_pointer(entry->next, p); rcu_assign_pointer(*pp, entry); @@ -137,12 +136,11 @@ void nf_unregister_net_hook(struct net *net, const struct nf_hook_ops *reg) return; mutex_lock(&nf_hook_mutex); - while ((p = nf_entry_dereference(*pp)) != NULL) { + for (; (p = nf_entry_dereference(*pp)) != NULL; pp = &p->next) { if (nf_hook_entry_ops(p) == reg) { rcu_assign_pointer(*pp, p->next); break; } - pp = &p->next; } mutex_unlock(&nf_hook_mutex); if (!p) {