mirror of
https://github.com/torvalds/linux.git
synced 2024-12-16 08:02:17 +00:00
ipvs: Pass ipvs not net into ip_vs_app_inc_release
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:
parent
9f8128a56e
commit
09858708e6
@ -127,9 +127,8 @@ ip_vs_app_inc_new(struct netns_ipvs *ipvs, struct ip_vs_app *app, __u16 proto,
|
||||
* Release app incarnation
|
||||
*/
|
||||
static void
|
||||
ip_vs_app_inc_release(struct net *net, struct ip_vs_app *inc)
|
||||
ip_vs_app_inc_release(struct netns_ipvs *ipvs, struct ip_vs_app *inc)
|
||||
{
|
||||
struct netns_ipvs *ipvs = net_ipvs(net);
|
||||
struct ip_vs_protocol *pp;
|
||||
|
||||
if (!(pp = ip_vs_proto_get(inc->protocol)))
|
||||
@ -230,7 +229,6 @@ out_unlock:
|
||||
void unregister_ip_vs_app(struct netns_ipvs *ipvs, struct ip_vs_app *app)
|
||||
{
|
||||
struct ip_vs_app *a, *anxt, *inc, *nxt;
|
||||
struct net *net = ipvs->net;
|
||||
|
||||
mutex_lock(&__ip_vs_app_mutex);
|
||||
|
||||
@ -238,7 +236,7 @@ void unregister_ip_vs_app(struct netns_ipvs *ipvs, struct ip_vs_app *app)
|
||||
if (app && strcmp(app->name, a->name))
|
||||
continue;
|
||||
list_for_each_entry_safe(inc, nxt, &a->incs_list, a_list) {
|
||||
ip_vs_app_inc_release(net, inc);
|
||||
ip_vs_app_inc_release(ipvs, inc);
|
||||
}
|
||||
|
||||
list_del(&a->a_list);
|
||||
|
Loading…
Reference in New Issue
Block a user