From 2d826d6c531c7a9e2da32dc4486d663bd02b286e Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 29 Aug 2012 06:49:11 +0000 Subject: [PATCH] --- yaml --- r: 322445 b: refs/heads/master c: 0a54e939d8c2647c711ef2369c3e73c3b7f3028c h: refs/heads/master i: 322443: 59f9d1276f7e1f2081226eb552d5791a23987bf8 v: v3 --- [refs] | 2 +- trunk/net/netfilter/ipvs/ip_vs_ctl.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1336920e808b..82bd04596120 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2dba62c30ec3040ef1b647a8976fd7e6854cc7a7 +refs/heads/master: 0a54e939d8c2647c711ef2369c3e73c3b7f3028c diff --git a/trunk/net/netfilter/ipvs/ip_vs_ctl.c b/trunk/net/netfilter/ipvs/ip_vs_ctl.c index 72bf32a84874..f51013c07b9f 100644 --- a/trunk/net/netfilter/ipvs/ip_vs_ctl.c +++ b/trunk/net/netfilter/ipvs/ip_vs_ctl.c @@ -1171,8 +1171,10 @@ ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u, goto out_err; } svc->stats.cpustats = alloc_percpu(struct ip_vs_cpu_stats); - if (!svc->stats.cpustats) + if (!svc->stats.cpustats) { + ret = -ENOMEM; goto out_err; + } /* I'm the first user of the service */ atomic_set(&svc->usecnt, 0);