From patchwork Fri Aug 17 04:33:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wang X-Patchwork-Id: 178138 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 81D232C0085 for ; Fri, 17 Aug 2012 14:34:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753521Ab2HQEeD (ORCPT ); Fri, 17 Aug 2012 00:34:03 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:41687 "EHLO e23smtp04.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753263Ab2HQEdt (ORCPT ); Fri, 17 Aug 2012 00:33:49 -0400 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 17 Aug 2012 14:32:33 +1000 Received: from d23relay03.au.ibm.com (202.81.31.245) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 17 Aug 2012 14:32:29 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7H4Xh7N20906070; Fri, 17 Aug 2012 14:33:43 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7H4XggC027159; Fri, 17 Aug 2012 14:33:42 +1000 Received: from [9.123.247.139] ([9.123.247.139]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q7H4Xe8e027150; Fri, 17 Aug 2012 14:33:40 +1000 Message-ID: <502DC9A3.2070703@linux.vnet.ibm.com> Date: Fri, 17 Aug 2012 12:33:39 +0800 From: Michael Wang User-Agent: Mozilla/5.0 (X11; Linux i686; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: LKML , "netdev@vger.kernel.org" , netfilter@vger.kernel.org, coreteam@netfilter.org, netfilter-devel@vger.kernel.org CC: David Miller , kaber@trash.net, pablo@netfilter.org, "paulmck@linux.vnet.ibm.com" Subject: [PATCH 3/3] netfilter: replace list_for_each_continue_rcu with new interface References: <502CB939.3050008@linux.vnet.ibm.com> In-Reply-To: <502CB939.3050008@linux.vnet.ibm.com> X-Forwarded-Message-Id: <502CB939.3050008@linux.vnet.ibm.com> x-cbid: 12081704-9264-0000-0000-000002253723 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Michael Wang This patch replaces list_for_each_continue_rcu() with list_for_each_entry_continue_rcu() to allow removing list_for_each_continue_rcu(). Signed-off-by: Michael Wang Reviewed-by: Paul E. McKenney --- net/netfilter/core.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net/netfilter/core.c b/net/netfilter/core.c index e19f365..50225bd 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -131,14 +131,14 @@ unsigned int nf_iterate(struct list_head *head, int hook_thresh) { unsigned int verdict; + struct nf_hook_ops *elem = list_entry_rcu(*i, + struct nf_hook_ops, list); /* * The caller must not block between calls to this * function because of risk of continuing from deleted element. */ - list_for_each_continue_rcu(*i, head) { - struct nf_hook_ops *elem = (struct nf_hook_ops *)*i; - + list_for_each_entry_continue_rcu(elem, head, list) { if (hook_thresh > elem->priority) continue; @@ -155,11 +155,14 @@ repeat: continue; } #endif - if (verdict != NF_REPEAT) + if (verdict != NF_REPEAT) { + *i = &elem->list; return verdict; + } goto repeat; } } + *i = &elem->list; return NF_ACCEPT; }