Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756158AbYLJUGV (ORCPT ); Wed, 10 Dec 2008 15:06:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753766AbYLJUGG (ORCPT ); Wed, 10 Dec 2008 15:06:06 -0500 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.123]:46780 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753232AbYLJUGE (ORCPT ); Wed, 10 Dec 2008 15:06:04 -0500 Date: Wed, 10 Dec 2008 15:06:00 -0500 (EST) From: Steven Rostedt X-X-Sender: rostedt@gandalf.stny.rr.com To: Linux Netdev List , LKML cc: Eric Dumazet , Ingo Molnar , Andrew Morton , Arnaldo Carvalho de Melo , "David S. Miller" Subject: [PATCH] update rwlock initialization for nat_table In-Reply-To: <49400B7F.7040607@cosmosbay.com> Message-ID: References: <49400B7F.7040607@cosmosbay.com> User-Agent: Alpine 1.10 (DEB 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1520 Lines: 50 The following patch is in: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git branch: cleanups Steven Rostedt (1): update rwlock initialization for nat_table ---- net/ipv4/netfilter/nf_nat_rule.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --------------------------- commit d4175059c8f95e4cd58e0efaa85610ca59469fbd Author: Steven Rostedt Date: Wed Dec 10 15:00:09 2008 -0500 update rwlock initialization for nat_table Impact: clean up The commit e099a173573ce1ba171092aee7bb3c72ea686e59 (netfilter: netns nat: per-netns NAT table) renamed the nat_table from __nat_table to nat_table without updating the __RW_LOCK_UNLOCKED(__nat_table.lock). Signed-off-by: Steven Rostedt diff --git a/net/ipv4/netfilter/nf_nat_rule.c b/net/ipv4/netfilter/nf_nat_rule.c index bea54a6..8d489e7 100644 --- a/net/ipv4/netfilter/nf_nat_rule.c +++ b/net/ipv4/netfilter/nf_nat_rule.c @@ -61,7 +61,7 @@ static struct static struct xt_table nat_table = { .name = "nat", .valid_hooks = NAT_VALID_HOOKS, - .lock = __RW_LOCK_UNLOCKED(__nat_table.lock), + .lock = __RW_LOCK_UNLOCKED(nat_table.lock), .me = THIS_MODULE, .af = AF_INET, }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/