evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IPVS: ip_vs_{un,}bind_scheduler NULL arguments

Browse source 
In general NULL arguments aren't passed by the few callers that exist,
so don't test for them.

The exception is to make passing NULL to ip_vs_unbind_scheduler() a noop.

Signed-off-by: Simon Horman <horms@verge.net.au>
Acked-by: Julian Anastasov <ja@ssi.bg>
This commit is contained in:
Simon Horman 2010-08-22 21:37:52 +09:00
parent 6e08bfb879
commit 2fabf35bfc
2 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/netfilter/ipvs/ip_vs_ctl.c
View file

@ -1206,8 +1206,7 @@ ip_vs_add_service(struct ip_vs_service_user_kern *u,
out_err: out_err:
if (svc != NULL) { if (svc != NULL) {
if (svc->scheduler) ip_vs_unbind_scheduler(svc);
ip_vs_unbind_scheduler(svc);
if (svc->inc) { if (svc->inc) {
local_bh_disable(); local_bh_disable();
ip_vs_app_inc_put(svc->inc); ip_vs_app_inc_put(svc->inc);

23
net/netfilter/ipvs/ip_vs_sched.c
View file

@ -46,15 +46,6 @@ int ip_vs_bind_scheduler(struct ip_vs_service *svc,
{ {
int ret; int ret;
if (svc == NULL) {
pr_err("%s(): svc arg NULL\n", __func__);
return -EINVAL;
}
if (scheduler == NULL) {
pr_err("%s(): scheduler arg NULL\n", __func__);
return -EINVAL;
}
svc->scheduler = scheduler; svc->scheduler = scheduler;
if (scheduler->init_service) { if (scheduler->init_service) {
@ -74,18 +65,10 @@ int ip_vs_bind_scheduler(struct ip_vs_service *svc,
*/ */
int ip_vs_unbind_scheduler(struct ip_vs_service *svc) int ip_vs_unbind_scheduler(struct ip_vs_service *svc)
{ {
struct ip_vs_scheduler *sched; struct ip_vs_scheduler *sched = svc->scheduler;
if (svc == NULL) { if (!sched)
pr_err("%s(): svc arg NULL\n", __func__); return 0;
return -EINVAL;
}
sched = svc->scheduler;
if (sched == NULL) {
pr_err("%s(): svc isn't bound\n", __func__);
return -EINVAL;
}
if (sched->done_service) { if (sched->done_service) {
if (sched->done_service(svc) != 0) { if (sched->done_service(svc) != 0) {