LVS
lvs-devel
Google
 
Web LinuxVirtualServer.org

[*v2 PATCH 6/9] IPVS: Remove useless { } block from ip_vs_process_messag

To: horms@xxxxxxxxxxxx, ja@xxxxxx, lvs-devel@xxxxxxxxxxxxxxx
Subject: [*v2 PATCH 6/9] IPVS: Remove useless { } block from ip_vs_process_message()
Cc: wensong@xxxxxxxxxxxx, Hans Schillstrom <hans.schillstrom@xxxxxxxxxxxx>
From: Hans Schillstrom <hans.schillstrom@xxxxxxxxxxxx>
Date: Fri, 12 Nov 2010 08:34:58 +0100
From: Simon Horman <horms@xxxxxxxxxxxx>

Acked-by: Hans Schillstrom <hans.schillstrom@xxxxxxxxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
Signed-off-by: Hans Schillstrom <hans.schillstrom@xxxxxxxxxxxx>
---
 net/netfilter/ipvs/ip_vs_sync.c |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 4b0ed40..f21506c 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -511,20 +511,18 @@ static void ip_vs_process_message(const char *buffer, 
const size_t buflen)
                        }
                }
 
-               {
-                       if (ip_vs_conn_fill_param_sync(AF_INET, s->protocol,
-                                             (union nf_inet_addr *)&s->caddr,
-                                             s->cport,
-                                             (union nf_inet_addr *)&s->vaddr,
-                                             s->vport, &param)) {
-                               pr_err("ip_vs_conn_fill_param_sync failed");
-                               return;
-                       }
-                       if (!(flags & IP_VS_CONN_F_TEMPLATE))
-                               cp = ip_vs_conn_in_get(&param);
-                       else
-                               cp = ip_vs_ct_in_get(&param);
+               if (ip_vs_conn_fill_param_sync(AF_INET, s->protocol,
+                                              (union nf_inet_addr *)&s->caddr,
+                                              s->cport,
+                                              (union nf_inet_addr *)&s->vaddr,
+                                              s->vport, &param)) {
+                       pr_err("ip_vs_conn_fill_param_sync failed");
+                       return;
                }
+               if (!(flags & IP_VS_CONN_F_TEMPLATE))
+                       cp = ip_vs_conn_in_get(&param);
+               else
+                       cp = ip_vs_ct_in_get(&param);
                if (!cp) {
                        /*
                         * Find the appropriate destination for the connection.
-- 
1.7.2.3

--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

<Prev in Thread] Current Thread [Next in Thread>
  • [*v2 PATCH 6/9] IPVS: Remove useless { } block from ip_vs_process_message(), Hans Schillstrom <=