hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipvs: Pass ipvs not net into ip_vs_app_inc_new 

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Eric W. Biederman 2015-09-21 13:02:30 -05:00 committed by Simon Horman
parent 19648918fb
commit a080ce38a0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/netfilter/ipvs/ip_vs_app.c
View File

@ -75,10 +75,9 @@ static void ip_vs_app_inc_rcu_free(struct rcu_head *head)
* Allocate/initialize app incarnation and register it in proto apps. * Allocate/initialize app incarnation and register it in proto apps.
*/ */
static int static int
ip_vs_app_inc_new(struct net *net, struct ip_vs_app *app, __u16 proto, ip_vs_app_inc_new(struct netns_ipvs *ipvs, struct ip_vs_app *app, __u16 proto,
__u16 port) __u16 port)
{ {
struct netns_ipvs *ipvs = net_ipvs(net);
struct ip_vs_protocol *pp; struct ip_vs_protocol *pp;
struct ip_vs_app *inc; struct ip_vs_app *inc;
int ret; int ret;
@ -180,11 +179,12 @@ int
register_ip_vs_app_inc(struct net *net, struct ip_vs_app *app, __u16 proto, register_ip_vs_app_inc(struct net *net, struct ip_vs_app *app, __u16 proto,
__u16 port) __u16 port)
{ {
struct netns_ipvs *ipvs = net_ipvs(net);
int result; int result;
mutex_lock(&__ip_vs_app_mutex); mutex_lock(&__ip_vs_app_mutex);
result = ip_vs_app_inc_new(net, app, proto, port); result = ip_vs_app_inc_new(ipvs, app, proto, port);
mutex_unlock(&__ip_vs_app_mutex); mutex_unlock(&__ip_vs_app_mutex);