From patchwork Fri Apr 29 06:25:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Schillstrom X-Patchwork-Id: 93392 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 028CFB6FD6 for ; Fri, 29 Apr 2011 16:25:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753987Ab1D2GZq (ORCPT ); Fri, 29 Apr 2011 02:25:46 -0400 Received: from smtp-gw11.han.skanova.net ([81.236.55.20]:32771 "EHLO smtp-gw11.han.skanova.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752352Ab1D2GZn (ORCPT ); Fri, 29 Apr 2011 02:25:43 -0400 Received: from dmz.mlab.se (213.65.94.224) by smtp-gw11.han.skanova.net (8.5.133) id 4D651BF901D23E98; Fri, 29 Apr 2011 08:25:41 +0200 Received: from quad.mlab.se (quad.mlab.se [172.24.1.70]) by dmz.mlab.se (8.13.8/8.13.8) with ESMTP id p3T6Pd8x027244; Fri, 29 Apr 2011 08:25:39 +0200 Received: from quad.mlab.se (localhost.localdomain [127.0.0.1]) by quad.mlab.se (8.14.4/8.14.4) with ESMTP id p3T6PcZU017642; Fri, 29 Apr 2011 08:25:38 +0200 Received: (from hans@localhost) by quad.mlab.se (8.14.4/8.14.4/Submit) id p3T6Pcqa017641; Fri, 29 Apr 2011 08:25:38 +0200 From: Hans Schillstrom To: ja@ssi.bg, horms@verge.net.au, ebiederm@xmission.com, lvs-devel@vger.kernel.org, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org Cc: hans.schillstrom@ericsson.com, Hans Schillstrom Subject: [v3 PATCH 2/6] IPVS: labels at pos 0 Date: Fri, 29 Apr 2011 08:25:30 +0200 Message-Id: <1304058334-17594-3-git-send-email-hans@schillstrom.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1304058334-17594-1-git-send-email-hans@schillstrom.com> References: <1304058334-17594-1-git-send-email-hans@schillstrom.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Put goto labels at the beginig of row acording to coding style example. Signed-off-by: Hans Schillstrom Signed-off-by: Hans Schillstrom --- net/netfilter/ipvs/ip_vs_core.c | 10 +++++----- net/netfilter/ipvs/ip_vs_ctl.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index a0791dc..d536b51 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -1388,7 +1388,7 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum) verdict = NF_DROP; } - out: +out: __ip_vs_conn_put(cp); return verdict; @@ -1955,14 +1955,14 @@ static int __init ip_vs_init(void) cleanup_sync: ip_vs_sync_cleanup(); - cleanup_conn: +cleanup_conn: ip_vs_conn_cleanup(); - cleanup_app: +cleanup_app: ip_vs_app_cleanup(); - cleanup_protocol: +cleanup_protocol: ip_vs_protocol_cleanup(); ip_vs_control_cleanup(); - cleanup_estimator: +cleanup_estimator: ip_vs_estimator_cleanup(); unregister_pernet_subsys(&ipvs_core_ops); /* free ip_vs struct */ return ret; diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index ae47090..a31a70c 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -1327,9 +1327,9 @@ ip_vs_edit_service(struct ip_vs_service *svc, struct ip_vs_service_user_kern *u) ip_vs_bind_pe(svc, pe); } - out_unlock: +out_unlock: write_unlock_bh(&__ip_vs_svc_lock); - out: +out: ip_vs_scheduler_put(old_sched); ip_vs_pe_put(old_pe); return ret; @@ -2387,7 +2387,7 @@ __ip_vs_get_service_entries(struct net *net, count++; } } - out: +out: return ret; } @@ -2625,7 +2625,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) ret = -EINVAL; } - out: +out: mutex_unlock(&__ip_vs_mutex); return ret; }