diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-02-09 09:24:47 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-11 02:19:39 -0500 |
commit | e905a9edab7f4f14f9213b52234e4a346c690911 (patch) | |
tree | 9e52a5f47eec47c5685c347ff7af22290a10305b /net/ipv4/ipvs | |
parent | 642656518b2e64fd59d9bbd15b6885cac5fe99b1 (diff) |
[NET] IPV4: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipvs')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_conn.c | 10 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_core.c | 20 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_ftp.c | 2 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_lblc.c | 12 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_lblcr.c | 8 | ||||
-rw-r--r-- | net/ipv4/ipvs/ip_vs_rr.c | 2 |
6 files changed, 27 insertions, 27 deletions
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c index 8086787a2c51..6feeb1f1c9cc 100644 --- a/net/ipv4/ipvs/ip_vs_conn.c +++ b/net/ipv4/ipvs/ip_vs_conn.c | |||
@@ -494,8 +494,8 @@ int ip_vs_check_template(struct ip_vs_conn *ct) | |||
494 | * Checking the dest server status. | 494 | * Checking the dest server status. |
495 | */ | 495 | */ |
496 | if ((dest == NULL) || | 496 | if ((dest == NULL) || |
497 | !(dest->flags & IP_VS_DEST_F_AVAILABLE) || | 497 | !(dest->flags & IP_VS_DEST_F_AVAILABLE) || |
498 | (sysctl_ip_vs_expire_quiescent_template && | 498 | (sysctl_ip_vs_expire_quiescent_template && |
499 | (atomic_read(&dest->weight) == 0))) { | 499 | (atomic_read(&dest->weight) == 0))) { |
500 | IP_VS_DBG(9, "check_template: dest not available for " | 500 | IP_VS_DBG(9, "check_template: dest not available for " |
501 | "protocol %s s:%u.%u.%u.%u:%d v:%u.%u.%u.%u:%d " | 501 | "protocol %s s:%u.%u.%u.%u:%d v:%u.%u.%u.%u:%d " |
@@ -667,7 +667,7 @@ static void *ip_vs_conn_array(struct seq_file *seq, loff_t pos) | |||
667 | { | 667 | { |
668 | int idx; | 668 | int idx; |
669 | struct ip_vs_conn *cp; | 669 | struct ip_vs_conn *cp; |
670 | 670 | ||
671 | for(idx = 0; idx < IP_VS_CONN_TAB_SIZE; idx++) { | 671 | for(idx = 0; idx < IP_VS_CONN_TAB_SIZE; idx++) { |
672 | ct_read_lock_bh(idx); | 672 | ct_read_lock_bh(idx); |
673 | list_for_each_entry(cp, &ip_vs_conn_tab[idx], c_list) { | 673 | list_for_each_entry(cp, &ip_vs_conn_tab[idx], c_list) { |
@@ -695,7 +695,7 @@ static void *ip_vs_conn_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
695 | int idx; | 695 | int idx; |
696 | 696 | ||
697 | ++*pos; | 697 | ++*pos; |
698 | if (v == SEQ_START_TOKEN) | 698 | if (v == SEQ_START_TOKEN) |
699 | return ip_vs_conn_array(seq, 0); | 699 | return ip_vs_conn_array(seq, 0); |
700 | 700 | ||
701 | /* more on same hash chain? */ | 701 | /* more on same hash chain? */ |
@@ -710,7 +710,7 @@ static void *ip_vs_conn_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
710 | list_for_each_entry(cp, &ip_vs_conn_tab[idx], c_list) { | 710 | list_for_each_entry(cp, &ip_vs_conn_tab[idx], c_list) { |
711 | seq->private = &ip_vs_conn_tab[idx]; | 711 | seq->private = &ip_vs_conn_tab[idx]; |
712 | return cp; | 712 | return cp; |
713 | } | 713 | } |
714 | ct_read_unlock_bh(idx); | 714 | ct_read_unlock_bh(idx); |
715 | } | 715 | } |
716 | seq->private = NULL; | 716 | seq->private = NULL; |
diff --git a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c index 34257520a3a6..24d7b66eb6d2 100644 --- a/net/ipv4/ipvs/ip_vs_core.c +++ b/net/ipv4/ipvs/ip_vs_core.c | |||
@@ -813,14 +813,14 @@ ip_vs_out(unsigned int hooknum, struct sk_buff **pskb, | |||
813 | skb->nh.iph->saddr = cp->vaddr; | 813 | skb->nh.iph->saddr = cp->vaddr; |
814 | ip_send_check(skb->nh.iph); | 814 | ip_send_check(skb->nh.iph); |
815 | 815 | ||
816 | /* For policy routing, packets originating from this | 816 | /* For policy routing, packets originating from this |
817 | * machine itself may be routed differently to packets | 817 | * machine itself may be routed differently to packets |
818 | * passing through. We want this packet to be routed as | 818 | * passing through. We want this packet to be routed as |
819 | * if it came from this machine itself. So re-compute | 819 | * if it came from this machine itself. So re-compute |
820 | * the routing information. | 820 | * the routing information. |
821 | */ | 821 | */ |
822 | if (ip_route_me_harder(pskb, RTN_LOCAL) != 0) | 822 | if (ip_route_me_harder(pskb, RTN_LOCAL) != 0) |
823 | goto drop; | 823 | goto drop; |
824 | skb = *pskb; | 824 | skb = *pskb; |
825 | 825 | ||
826 | IP_VS_DBG_PKT(10, pp, skb, 0, "After SNAT"); | 826 | IP_VS_DBG_PKT(10, pp, skb, 0, "After SNAT"); |
@@ -847,7 +847,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff **pskb, | |||
847 | * forward to the right destination host if relevant. | 847 | * forward to the right destination host if relevant. |
848 | * Currently handles error types - unreachable, quench, ttl exceeded. | 848 | * Currently handles error types - unreachable, quench, ttl exceeded. |
849 | */ | 849 | */ |
850 | static int | 850 | static int |
851 | ip_vs_in_icmp(struct sk_buff **pskb, int *related, unsigned int hooknum) | 851 | ip_vs_in_icmp(struct sk_buff **pskb, int *related, unsigned int hooknum) |
852 | { | 852 | { |
853 | struct sk_buff *skb = *pskb; | 853 | struct sk_buff *skb = *pskb; |
@@ -863,7 +863,7 @@ ip_vs_in_icmp(struct sk_buff **pskb, int *related, unsigned int hooknum) | |||
863 | /* reassemble IP fragments */ | 863 | /* reassemble IP fragments */ |
864 | if (skb->nh.iph->frag_off & __constant_htons(IP_MF|IP_OFFSET)) { | 864 | if (skb->nh.iph->frag_off & __constant_htons(IP_MF|IP_OFFSET)) { |
865 | skb = ip_vs_gather_frags(skb, | 865 | skb = ip_vs_gather_frags(skb, |
866 | hooknum == NF_IP_LOCAL_IN ? | 866 | hooknum == NF_IP_LOCAL_IN ? |
867 | IP_DEFRAG_VS_IN : IP_DEFRAG_VS_FWD); | 867 | IP_DEFRAG_VS_IN : IP_DEFRAG_VS_FWD); |
868 | if (!skb) | 868 | if (!skb) |
869 | return NF_STOLEN; | 869 | return NF_STOLEN; |
diff --git a/net/ipv4/ipvs/ip_vs_ftp.c b/net/ipv4/ipvs/ip_vs_ftp.c index 687c1de1146f..847c47af040c 100644 --- a/net/ipv4/ipvs/ip_vs_ftp.c +++ b/net/ipv4/ipvs/ip_vs_ftp.c | |||
@@ -370,7 +370,7 @@ static int __init ip_vs_ftp_init(void) | |||
370 | if (ret) | 370 | if (ret) |
371 | break; | 371 | break; |
372 | IP_VS_INFO("%s: loaded support on port[%d] = %d\n", | 372 | IP_VS_INFO("%s: loaded support on port[%d] = %d\n", |
373 | app->name, i, ports[i]); | 373 | app->name, i, ports[i]); |
374 | } | 374 | } |
375 | 375 | ||
376 | if (ret) | 376 | if (ret) |
diff --git a/net/ipv4/ipvs/ip_vs_lblc.c b/net/ipv4/ipvs/ip_vs_lblc.c index a4385a2180ee..76fd1fb91878 100644 --- a/net/ipv4/ipvs/ip_vs_lblc.c +++ b/net/ipv4/ipvs/ip_vs_lblc.c | |||
@@ -118,7 +118,7 @@ static ctl_table vs_vars_table[] = { | |||
118 | .procname = "lblc_expiration", | 118 | .procname = "lblc_expiration", |
119 | .data = &sysctl_ip_vs_lblc_expiration, | 119 | .data = &sysctl_ip_vs_lblc_expiration, |
120 | .maxlen = sizeof(int), | 120 | .maxlen = sizeof(int), |
121 | .mode = 0644, | 121 | .mode = 0644, |
122 | .proc_handler = &proc_dointvec_jiffies, | 122 | .proc_handler = &proc_dointvec_jiffies, |
123 | }, | 123 | }, |
124 | { .ctl_name = 0 } | 124 | { .ctl_name = 0 } |
@@ -128,7 +128,7 @@ static ctl_table vs_table[] = { | |||
128 | { | 128 | { |
129 | .ctl_name = NET_IPV4_VS, | 129 | .ctl_name = NET_IPV4_VS, |
130 | .procname = "vs", | 130 | .procname = "vs", |
131 | .mode = 0555, | 131 | .mode = 0555, |
132 | .child = vs_vars_table | 132 | .child = vs_vars_table |
133 | }, | 133 | }, |
134 | { .ctl_name = 0 } | 134 | { .ctl_name = 0 } |
@@ -137,7 +137,7 @@ static ctl_table vs_table[] = { | |||
137 | static ctl_table ipvs_ipv4_table[] = { | 137 | static ctl_table ipvs_ipv4_table[] = { |
138 | { | 138 | { |
139 | .ctl_name = NET_IPV4, | 139 | .ctl_name = NET_IPV4, |
140 | .procname = "ipv4", | 140 | .procname = "ipv4", |
141 | .mode = 0555, | 141 | .mode = 0555, |
142 | .child = vs_table | 142 | .child = vs_table |
143 | }, | 143 | }, |
@@ -147,8 +147,8 @@ static ctl_table ipvs_ipv4_table[] = { | |||
147 | static ctl_table lblc_root_table[] = { | 147 | static ctl_table lblc_root_table[] = { |
148 | { | 148 | { |
149 | .ctl_name = CTL_NET, | 149 | .ctl_name = CTL_NET, |
150 | .procname = "net", | 150 | .procname = "net", |
151 | .mode = 0555, | 151 | .mode = 0555, |
152 | .child = ipvs_ipv4_table | 152 | .child = ipvs_ipv4_table |
153 | }, | 153 | }, |
154 | { .ctl_name = 0 } | 154 | { .ctl_name = 0 } |
@@ -288,7 +288,7 @@ static inline void ip_vs_lblc_full_check(struct ip_vs_lblc_table *tbl) | |||
288 | 288 | ||
289 | write_lock(&tbl->lock); | 289 | write_lock(&tbl->lock); |
290 | list_for_each_entry_safe(en, nxt, &tbl->bucket[j], list) { | 290 | list_for_each_entry_safe(en, nxt, &tbl->bucket[j], list) { |
291 | if (time_before(now, | 291 | if (time_before(now, |
292 | en->lastuse + sysctl_ip_vs_lblc_expiration)) | 292 | en->lastuse + sysctl_ip_vs_lblc_expiration)) |
293 | continue; | 293 | continue; |
294 | 294 | ||
diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c index fe1af5d079af..bf1e7f272b84 100644 --- a/net/ipv4/ipvs/ip_vs_lblcr.c +++ b/net/ipv4/ipvs/ip_vs_lblcr.c | |||
@@ -307,7 +307,7 @@ static ctl_table vs_vars_table[] = { | |||
307 | .procname = "lblcr_expiration", | 307 | .procname = "lblcr_expiration", |
308 | .data = &sysctl_ip_vs_lblcr_expiration, | 308 | .data = &sysctl_ip_vs_lblcr_expiration, |
309 | .maxlen = sizeof(int), | 309 | .maxlen = sizeof(int), |
310 | .mode = 0644, | 310 | .mode = 0644, |
311 | .proc_handler = &proc_dointvec_jiffies, | 311 | .proc_handler = &proc_dointvec_jiffies, |
312 | }, | 312 | }, |
313 | { .ctl_name = 0 } | 313 | { .ctl_name = 0 } |
@@ -326,7 +326,7 @@ static ctl_table vs_table[] = { | |||
326 | static ctl_table ipvs_ipv4_table[] = { | 326 | static ctl_table ipvs_ipv4_table[] = { |
327 | { | 327 | { |
328 | .ctl_name = NET_IPV4, | 328 | .ctl_name = NET_IPV4, |
329 | .procname = "ipv4", | 329 | .procname = "ipv4", |
330 | .mode = 0555, | 330 | .mode = 0555, |
331 | .child = vs_table | 331 | .child = vs_table |
332 | }, | 332 | }, |
@@ -336,8 +336,8 @@ static ctl_table ipvs_ipv4_table[] = { | |||
336 | static ctl_table lblcr_root_table[] = { | 336 | static ctl_table lblcr_root_table[] = { |
337 | { | 337 | { |
338 | .ctl_name = CTL_NET, | 338 | .ctl_name = CTL_NET, |
339 | .procname = "net", | 339 | .procname = "net", |
340 | .mode = 0555, | 340 | .mode = 0555, |
341 | .child = ipvs_ipv4_table | 341 | .child = ipvs_ipv4_table |
342 | }, | 342 | }, |
343 | { .ctl_name = 0 } | 343 | { .ctl_name = 0 } |
diff --git a/net/ipv4/ipvs/ip_vs_rr.c b/net/ipv4/ipvs/ip_vs_rr.c index b23bab231cab..433f8a947924 100644 --- a/net/ipv4/ipvs/ip_vs_rr.c +++ b/net/ipv4/ipvs/ip_vs_rr.c | |||
@@ -68,7 +68,7 @@ ip_vs_rr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) | |||
68 | q = q->next; | 68 | q = q->next; |
69 | continue; | 69 | continue; |
70 | } | 70 | } |
71 | 71 | ||
72 | dest = list_entry(q, struct ip_vs_dest, n_list); | 72 | dest = list_entry(q, struct ip_vs_dest, n_list); |
73 | if (!(dest->flags & IP_VS_DEST_F_OVERLOAD) && | 73 | if (!(dest->flags & IP_VS_DEST_F_OVERLOAD) && |
74 | atomic_read(&dest->weight) > 0) | 74 | atomic_read(&dest->weight) > 0) |