Index: trunk/routing/lvs/net/ipv4/ipvs/ip_vs_wcsh.c |
— | — | @@ -90,7 +90,7 @@ |
91 | 91 | */ |
92 | 92 | static int |
93 | 93 | ip_vs_wcsh_alloc_continuum(struct ip_vs_wcsh_data *sched_data, |
94 | | - const struct ip_vs_service *svc) |
| 94 | + const struct ip_vs_service *svc) |
95 | 95 | { |
96 | 96 | struct ip_vs_dest *dest; |
97 | 97 | |
— | — | @@ -137,7 +137,7 @@ |
138 | 138 | */ |
139 | 139 | static void |
140 | 140 | ip_vs_wcsh_create_continuum(const struct ip_vs_wcsh_data *sched_data, |
141 | | - const struct ip_vs_service *svc) |
| 141 | + const struct ip_vs_service *svc) |
142 | 142 | { |
143 | 143 | struct ip_vs_wcsh_dest_point *point; |
144 | 144 | struct ip_vs_dest *dest; |
— | — | @@ -184,8 +184,7 @@ |
185 | 185 | { |
186 | 186 | struct ip_vs_wcsh_dest_point *point; |
187 | 187 | |
188 | | - if (sched_data->pointcount == 0 || sched_data->continuum == NULL) |
189 | | - return; |
| 188 | + if (sched_data->continuum == NULL) return; |
190 | 189 | |
191 | 190 | for (point = sched_data->continuum |
192 | 191 | ; point != &sched_data->continuum[sched_data->pointcount] |
— | — | @@ -263,7 +262,7 @@ |
264 | 263 | |
265 | 264 | static struct ip_vs_wcsh_dest_point * |
266 | 265 | ip_vs_wcsh_get_nearest_point(const unsigned hashkey, |
267 | | - const struct ip_vs_wcsh_data *sched_data) |
| 266 | + const struct ip_vs_wcsh_data *sched_data) |
268 | 267 | { |
269 | 268 | unsigned int left, right; |
270 | 269 | |
— | — | @@ -288,7 +287,7 @@ |
289 | 288 | |
290 | 289 | if (hashkey <= sched_data->continuum[mid].value) |
291 | 290 | right = mid; |
292 | | - else /* hashkey > sched_data->continuum[mid].value */ |
| 291 | + else |
293 | 292 | left = mid; |
294 | 293 | } |
295 | 294 | /* continuum[right-1] < hashkey <= continuum[right] */ |
— | — | @@ -297,7 +296,7 @@ |
298 | 297 | |
299 | 298 | static struct ip_vs_wcsh_dest_point * |
300 | 299 | ip_vs_wcsh_get_feasible_dest(struct ip_vs_wcsh_dest_point *start, |
301 | | - const struct ip_vs_wcsh_data *sched_data) |
| 300 | + const struct ip_vs_wcsh_data *sched_data) |
302 | 301 | { |
303 | 302 | struct ip_vs_wcsh_dest_point *point = start; |
304 | 303 | unsigned int points_left = sched_data->pointcount; |