From patchwork Thu Jan 29 06:25:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 20942 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 35A74DE06B for ; Thu, 29 Jan 2009 17:27:27 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751916AbZA2G1W (ORCPT ); Thu, 29 Jan 2009 01:27:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751887AbZA2G1U (ORCPT ); Thu, 29 Jan 2009 01:27:20 -0500 Received: from suva.vyatta.com ([76.74.103.44]:59981 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751773AbZA2G1U (ORCPT ); Thu, 29 Jan 2009 01:27:20 -0500 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id n0T6RIrv015754; Wed, 28 Jan 2009 22:27:18 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n0T6RIL1015753; Wed, 28 Jan 2009 22:27:18 -0800 Message-Id: <20090129062549.115399366@vyatta.com> References: <20090129062521.092861272@vyatta.com> User-Agent: quilt/0.46-1 Date: Wed, 28 Jan 2009 22:25:24 -0800 From: Stephen Hemminger To: David Miller Cc: netdev@vger.kernel.org Subject: [PATCH 3/5] ebtables: remove unneeded initializations Content-Disposition: inline; filename=ebtables-lock-init.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The initialization of the lock element is not needed since the lock is always initialized in ebt_register_table. Signed-off-by: Stephen Hemminger --- net/bridge/netfilter/ebtable_broute.c | 1 - net/bridge/netfilter/ebtable_filter.c | 1 - net/bridge/netfilter/ebtable_nat.c | 1 - 3 files changed, 3 deletions(-) --- a/net/bridge/netfilter/ebtable_broute.c 2009-01-27 17:09:10.313100854 -0800 +++ b/net/bridge/netfilter/ebtable_broute.c 2009-01-27 17:09:15.862142852 -0800 @@ -46,7 +46,6 @@ static struct ebt_table broute_table = .name = "broute", .table = &initial_table, .valid_hooks = 1 << NF_BR_BROUTING, - .lock = __RW_LOCK_UNLOCKED(broute_table.lock), .check = check, .me = THIS_MODULE, }; --- a/net/bridge/netfilter/ebtable_filter.c 2009-01-27 17:08:50.725100955 -0800 +++ b/net/bridge/netfilter/ebtable_filter.c 2009-01-27 17:08:53.828611768 -0800 @@ -55,7 +55,6 @@ static struct ebt_table frame_filter = .name = "filter", .table = &initial_table, .valid_hooks = FILTER_VALID_HOOKS, - .lock = __RW_LOCK_UNLOCKED(frame_filter.lock), .check = check, .me = THIS_MODULE, }; --- a/net/bridge/netfilter/ebtable_nat.c 2009-01-27 17:09:22.896602465 -0800 +++ b/net/bridge/netfilter/ebtable_nat.c 2009-01-27 17:09:31.589085328 -0800 @@ -55,7 +55,6 @@ static struct ebt_table frame_nat = .name = "nat", .table = &initial_table, .valid_hooks = NAT_VALID_HOOKS, - .lock = __RW_LOCK_UNLOCKED(frame_nat.lock), .check = check, .me = THIS_MODULE, };