Commit 5ba049a5 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by David S. Miller
Browse files

net: Cleanup in copy_net_ns() 



Line up destructors actions in the revers order
to constructors. Next patches will add more actions,
and this will be comfortable, if there is the such
order.

Signed-off-by: default avatarKirill Tkhai <ktkhai@virtuozzo.com>
Acked-by: default avatarAndrei Vagin <avagin@virtuozzo.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 98f6c533

net/core/net_namespace.c

+9 −11
Original line number Diff line number Diff line
@@ -411,27 +411,25 @@ struct net *copy_net_ns(unsigned long flags, 


	net = net_alloc();

	if (!net) {

		dec_net_namespaces(ucounts);

		return ERR_PTR(-ENOMEM);

		rv = -ENOMEM;

		goto dec_ucounts;

	}



	refcount_set(&net->passive, 1);

	net->ucounts = ucounts;

	get_user_ns(user_ns);



	rv = mutex_lock_killable(&net_mutex);

	if (rv < 0) {

		net_free(net);

		dec_net_namespaces(ucounts);

		put_user_ns(user_ns);

		return ERR_PTR(rv);

	}

	if (rv < 0)

		goto put_userns;



	net->ucounts = ucounts;

	rv = setup_net(net, user_ns);

	mutex_unlock(&net_mutex);

	if (rv < 0) {

		dec_net_namespaces(ucounts);

put_userns:

		put_user_ns(user_ns);

		net_drop_ns(net);

dec_ucounts:

		dec_net_namespaces(ucounts);

		return ERR_PTR(rv);

	}

	return net;